-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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 bug with docker compatibility ArgsEscaped #964
Conversation
kokoro is failing but I believe this might be due to different behaviour with different docker versions. The latest stable version will return |
cc320a1
to
5d9edd0
Compare
368e860
to
34fb6c5
Compare
ArgsEscaped according to Docker docs should only be set in Windows environments: https://docs.docker.com/engine/api/v1.30/ It was causing integration test to fail with following message: ``` FAIL: TestRun/test_Dockerfile_test_metadata (8.48s) "Diff": { "Adds": [ "ArgsEscaped: true" ], "Dels": [ "ArgsEscaped: false" ] ``` However docker 18.xx returns ArgsEscaped: true whereas docker 19.xx returns ArgsEscaped: false Hence this patch also adds the docker version check to the integration to ignore ArgsEscaped being different when 18.xx is used.
34fb6c5
to
64bfc3e
Compare
@@ -18,6 +18,8 @@ set -ex | |||
GCS_BUCKET="${GCS_BUCKET:-gs://kaniko-test-bucket}" | |||
IMAGE_REPO="${IMAGE_REPO:-gcr.io/kaniko-test}" | |||
|
|||
docker version |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just 1 nit: you can remove this here and log it in the newly added getDockerMajorVersion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getDockerMajorVersion uses a template string to only get engine version. The command in script shows more info that's useful for debugging so I think should be kept as is.
ArgsEscaped according to Docker docs should only be set in Windows
environments: https://docs.docker.com/engine/api/v1.30/
It was causing a few integration tests to fail with following message:
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes
Release Notes
Change ArgsEscaped from true to false since this should only be used in Windows environments.