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.

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

docker version upgraded #16610

Merged
merged 3 commits into from
Jul 31, 2024
Merged

docker version upgraded #16610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4e1c1a
docker version upgraded
davidsanfal Jul 4, 2024
77391c7
runner_test.py moved to functional
davidsanfal Jul 10, 2024
5918fff
Merge branch 'develop2' into bug/runners
czoido Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conans/requirements_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ WebTest>=2.0.18, <2.1.0
bottle
PyJWT
pluginbase
docker>=5.0.0, <6.0.0
docker
setuptools
2 changes: 1 addition & 1 deletion conans/requirements_runner.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
paramiko
docker>=5.0.0, <6.0.0
docker>=7.1.0
0 ...ntegration/command/dockerfiles/Dockerfile → ...functional/command/dockerfiles/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...ation/command/dockerfiles/Dockerfile_args → ...ional/command/dockerfiles/Dockerfile_args
View file
Open in desktop
File renamed without changes.
0 ...tion/command/dockerfiles/Dockerfile_ninja → ...onal/command/dockerfiles/Dockerfile_ninja
View file
Open in desktop
File renamed without changes.
0 ...and/dockerfiles/Dockerfile_profile_detect → ...and/dockerfiles/Dockerfile_profile_detect
View file
Open in desktop
File renamed without changes.
0 ...ation/command/dockerfiles/Dockerfile_test → ...ional/command/dockerfiles/Dockerfile_test
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/integration/command/runner_test.py → test/functional/command/runner_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def test_create_docker_runner_from_configfile_with_args():
client.run("new cmake_lib -d name=pkg -d version=0.2")
client.run("create . -pr:h 'host' -pr:b 'build'")

assert "test/integration/command/dockerfiles/Dockerfile_args" in client.out
assert "command/dockerfiles/Dockerfile_args" in client.out
assert "Restore: pkg/0.2" in client.out
assert "Restore: pkg/0.2:8631cf963dbbb4d7a378a64a6fd1dc57558bc2fe" in client.out
assert "Restore: pkg/0.2:8631cf963dbbb4d7a378a64a6fd1dc57558bc2fe metadata" in client.out
Expand Down