Skip to content
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.

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

Replace docker-compose by 'docker compose' #40890

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

belimawr
Copy link
Contributor

Proposed commit message

The docker Compose V1 (docker-compose) stopped receiving updates on July 2023, this PR updates our automation tools to use the new Compose V2 (docker compose). Compose V2 has been GA since April 2022.

More information on
https://www.docker.com/blog/new-docker-compose-v2-and-v1-deprecation/.

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

There is no disruptive user impact

## Author's Checklist

How to test this PR locally

Run any mage /make target that uses docker, like the python integration tests

mage docker:composeUp
mage pythonIntegTest

## Related issues
## Use cases
## Screenshots
## Logs

@belimawr belimawr requested review from a team as code owners September 18, 2024 16:26
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 18, 2024
The docker Compose V1 (docker-compose) stopped receiving updates on
July 2023, this PR updates our automation tools to use the new Compose
V2 (docker compose). Compose V2 has been GA since April 2022.

More information on
https://www.docker.com/blog/new-docker-compose-v2-and-v1-deprecation/.
Copy link
Contributor

mergify bot commented Sep 18, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @belimawr? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Sep 18, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 18, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 18, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 18, 2024
@pierrehilbert pierrehilbert added needs_team Indicates that the issue/PR needs a Team:* label Team:Security-Windows Platform Windows Platform Team in Security Solution labels Sep 18, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 18, 2024
@botelastic
Copy link

botelastic bot commented Sep 18, 2024

This pull request doesn't have a Team:<team> label.

@pierrehilbert pierrehilbert requested review from rdner and removed request for khushijain21 September 18, 2024 17:03
@mauri870
Copy link
Member

I'm not sure if compose is installed by default in a docker installation, we might have to update images to install the plugin. Reading https://www.docker.com/blog/announcing-compose-v2-general-availability/ it seems that it only comes with Docker Desktop by default.

// PATH.
func HaveDockerCompose() error {
_, err := exec.LookPath("docker-compose")
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's also make sure that compose plugin is installed by runnigg (docker compose version)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's also make sure that compose plugin is installed by runnigg (docker compose version)

What do you mean? Call docker compose version, parse the output and ensure the compose plugin is installed?

Copy link
Member

Choose a reason for hiding this comment

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

I agree that this makes sense if the plugin is installed separately than docker itself. Otherwise, you are just testing that docker is available here, and not compose.

@rdner rdner removed their request for review October 7, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-Windows Platform Windows Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants