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

Migrate to Docker Compose V2 #5524

Merged
merged 3 commits into from
Dec 29, 2022
Merged

Conversation

SpecLad
Copy link
Contributor

@SpecLad SpecLad commented Dec 28, 2022

Also, migrate to the versionless Compose file format.

Motivation and context

Compose V1 is EOL: https://www.docker.com/blog/announcing-compose-v2-general-availability/.

How has this been tested?

  • I ran the Python tests with --stop-services, --rebuild and with no options to make sure that building, running and stopping the services still works.
  • I ran docker compose -f <...> config for all Compose files to make sure that the syntax is still considered valid by Compose V2.
  • I ran the Linux installation commands from the Installation Guide in a clean container.

Note that I did not test the Windows or macOS Installation Guide, but Docker Desktop now comes with Compose V2, so no special install steps should be needed.

Checklist

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

@SpecLad
Copy link
Contributor Author

SpecLad commented Dec 28, 2022

I added the file format change to the changelog. The rest I don't think is changelog-worthy, because it's just documentation and CI scripts. It's still possible to use Compose V1 with our Compose files, so it's not a breaking change.

@nmanovic
Copy link
Contributor

@azhavoro , could you please look?

@nmanovic nmanovic removed their request for review December 28, 2022 19:13
@azhavoro
Copy link
Contributor

LGTM

@nmanovic nmanovic merged commit 580ae49 into cvat-ai:develop Dec 29, 2022
@nmanovic nmanovic mentioned this pull request Jan 3, 2023
2 tasks
@SpecLad SpecLad deleted the docker-compose-v2 branch January 3, 2023 09:21
nmanovic pushed a commit that referenced this pull request Jan 3, 2023
I was supposed to do this in #5524 when I was removing them everywhere
else, but I didn't think to search the documentation. Compose override
files must have the same format as the base file, otherwise Docker
Compose rejects them.

Fixes #5544.
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Jul 1, 2023
Also, migrate to the version less Compose file format.

Compose V1 is EOL:
<https://www.docker.com/blog/announcing-compose-v2-general-availability/>.
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Jul 1, 2023
…t-ai#5545)

I was supposed to do this in cvat-ai#5524 when I was removing them everywhere
else, but I didn't think to search the documentation. Compose override
files must have the same format as the base file, otherwise Docker
Compose rejects them.

Fixes cvat-ai#5544.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants