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

Fix compatibility with older versions of Docker Compose #7170

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

SpecLad
Copy link
Contributor

@SpecLad SpecLad commented Nov 23, 2023

Motivation and context

In 6ae1cff, I accidentally left behind the empty command: key. This works, but only with Docker Compose v2.17.1+. Since we don't actually need this key, we might as well remove it and restore compatibility with older versions.

Also, rearrange the commented out code so that you only need to uncomment one block to enable the Traefik dashboard.

Fixes #7153.

How has this been tested?

Manual testing.

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • [ ] I have updated the documentation accordingly
  • [ ] I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • [ ] I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

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.

In 6ae1cff, I accidentally left behind the empty `command:` key. This
works, but only with Docker Compose v2.17.1+. Since we don't actually need
this key, we might as well remove it and restore compatibility with older
versions.

Also, rearrange the commented out code so that you only need to uncomment
one block to enable the Traefik dashboard.
@SpecLad SpecLad marked this pull request as ready for review November 23, 2023 12:19
Copy link

codecov bot commented Nov 23, 2023

Codecov Report

Merging #7170 (35d6335) into develop (791ba7f) will increase coverage by 0.01%.
The diff coverage is n/a.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7170      +/-   ##
===========================================
+ Coverage    81.44%   81.45%   +0.01%     
===========================================
  Files          364      364              
  Lines        39882    39882              
  Branches      3702     3702              
===========================================
+ Hits         32482    32487       +5     
+ Misses        7400     7395       -5     
Components Coverage Δ
cvat-ui 75.53% <ø> (+0.03%) ⬆️
cvat-server 87.01% <ø> (-0.01%) ⬇️

@pktiuk
Copy link
Contributor

pktiuk commented Nov 30, 2023

When it will be merged?

@bsekachev
Copy link
Member

@azhavoro
Could you please take a look?

@azhavoro azhavoro merged commit d7bbc10 into cvat-ai:develop Dec 14, 2023
43 checks passed
@cvat-bot cvat-bot bot mentioned this pull request Jan 10, 2024
@SpecLad SpecLad deleted the fix-docker-compose-compat branch September 30, 2024 10:51
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.

Docker compose up not working out of the box - "services.traefik.command must be a string"
4 participants