Skip to content

Fix usage of Docker Compose #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
rturner3 merged 6 commits into from
Jan 23, 2025
Merged

Fix usage of Docker Compose #139

rturner3 merged 6 commits into from
Jan 23, 2025

Conversation

@rturner3
Copy link
Contributor

@rturner3 rturner3 commented Jan 17, 2025 •
edited
Loading

  • Use docker compose rather than docker-compose command to be compatible with latest Docker versions
  • Bump actions versions to latest
  • Resolve Docker warnings by removing deprecated usage of Docker Compose version property and using consistent casing in Dockerfile keywords

@rturner3
Fix GitHub PR workflow
7c57897 
- Use "docker compose" rather than "docker-compose" command to be
  compatible with latest Docker versions
- Bump actions versions to latest

Signed-off-by: Ryan Turner <ryan.turner253@icloud.com>
@rturner3
Merge branch 'main' into fix-github-pr-workflow
fee173e
@rturner3 rturner3 changed the title Fix GitHub PR workflow Fix usage of Docker Compose Jan 17, 2025
@rturner3
Remove deprecated version property from docker-compose.yaml
0d71691 
Signed-off-by: Ryan Turner <ryan.turner253@icloud.com>
@rturner3
Match casing of Dockerfile keywords
23db55d 
Signed-off-by: Ryan Turner <ryan.turner253@icloud.com>
@rturner3
Merge branch 'main' into fix-github-pr-workflow
16ceeb3
sorindumitru
sorindumitru approved these changes Jan 18, 2025
View reviewed changes
Copy link
Contributor

@sorindumitru sorindumitru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sorindumitru sorindumitru mentioned this pull request Jan 18, 2025
Merged
@sorindumitru
Copy link
Contributor

sorindumitru commented Jan 23, 2025

@rturner3 db48c55 seems to have worked locally for me to fix the failing test.

@sorindumitru @rturner3
Increase lookup window for log search
2095105 
Signed-off-by: Sorin Dumitru <sorin@returnze.ro>
@rturner3
Copy link
Contributor Author

rturner3 commented Jan 23, 2025

@rturner3 db48c55 seems to have worked locally for me to fix the failing test.

Thanks! I cherry-picked this commit into this PR.

@rturner3 rturner3 merged commit 01f85ba into spiffe:main Jan 23, 2025
2 checks passed
CarloSegat pushed a commit to CarloSegat/spire-tutorials that referenced this pull request Jan 14, 2026
@rturner3 @sorindumitru
Fix usage of Docker Compose (spiffe#139)
bdd5e85 
* Fix GitHub PR workflow

- Use "docker compose" rather than "docker-compose" command to be
  compatible with latest Docker versions
- Bump actions versions to latest

Signed-off-by: Ryan Turner <ryan.turner253@icloud.com>
Signed-off-by: Sorin Dumitru <sorin@returnze.ro>
Co-authored-by: Sorin Dumitru <sorin@returnze.ro>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sorindumitru sorindumitru sorindumitru approved these changes

@MarcosDY MarcosDY MarcosDY approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rturner3 @sorindumitru @MarcosDY