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

Dockercompose version update 2.3 --> 3.3 #2235

Merged
merged 6 commits into from
Sep 28, 2020

Conversation

abdullahrkw
Copy link
Contributor

@abdullahrkw abdullahrkw commented Sep 28, 2020

Motivation and Context

Resolves #2232
I have removed the gateway key because it was not supported in dockercompose file version3. But, if you specify subnet, docker automatically choose relevant gateway. So, dockercompose network gateway is still 172.28.0.1.
Moreover, I have added driver key with default value. docker-compose was already using default value.

Checklist

  • I submit my changes into the develop branch
  • I have added description of my changes into CHANGELOG file
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues
  • 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.
  • I have updated the license header for each file (see an example below)

@bsekachev
Copy link
Member

Hi,
One more file is: components/serverless/docker-compose.serverless.yml

@bsekachev
Copy link
Member

And looks like built is fault with these changes:

ERROR: The Compose file './docker-compose.ci.yml' is invalid because:

services.cvat_ci.build contains unsupported option: 'network'

The command "docker-compose -f docker-compose.yml -f docker-compose.ci.yml build" failed and exited with 1 during .

Your build has been stopped.

@abdullahrkw
Copy link
Contributor Author

Hi,
One more file is: components/serverless/docker-compose.serverless.yml

updated.

@coveralls
Copy link

coveralls commented Sep 28, 2020

Coverage Status

Coverage remained the same at 65.311% when pulling 20b6f76 on abdullahrkw:dockercompose-version-update into b215f04 on openvinotoolkit:develop.

@bsekachev
Copy link
Member

@azhavoro What do you think about this PR?

@abdullahrkw
Copy link
Contributor Author

@bsekachev any update?

Copy link
Contributor

@nmanovic nmanovic left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution! Looks good from my perspective.

@nmanovic nmanovic merged commit abf9814 into cvat-ai:develop Sep 28, 2020
@abdullahrkw abdullahrkw deleted the dockercompose-version-update branch September 28, 2020 14:37
@syedmohsinbukhari
Copy link

image

@dasmehdix
Copy link

Please update documentation about "share_path" for version "3.3" (also for new users). I can't mount my dataset into docker.

@bsekachev
Copy link
Member

Please update documentation about "share_path" for version "3.3" (also for new users). I can't mount my dataset into docker.

Did it work for 2.3, but doesn't work for 3.3?

@azhavoro
Copy link
Contributor

azhavoro commented Oct 6, 2020

Please update documentation about "share_path" for version "3.3" (also for new users). I can't mount my dataset into docker.

Did it work for 2.3, but doesn't work for 3.3?

I believe there is version mismatch here: https://github.com/openvinotoolkit/cvat/blame/develop/cvat/apps/documentation/installation.md#L329

@bsekachev
Copy link
Member

I updated it in the PR #2261

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 file version update
7 participants