Fix bug with docker compatibility ArgsEscaped #964
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
kokoro is failing but I believe this might be due to different behaviour with different docker versions. The latest stable version will return |
samos123
force-pushed
the
fix-argsescape
branch
from
cc320a1
to
5d9edd0
Compare
samos123
changed the title
samos123
changed the title
samos123
force-pushed
the
fix-argsescape
branch
5 times, most recently
from
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.
samos123
force-pushed
the
fix-argsescape
branch
from
34fb6c5
to
64bfc3e
Compare
samos123
changed the title
cvgw
approved these changes
Jan 14, 2020
tejal29
approved these changes
Jan 14, 2020
tejal29
reviewed
Jan 14, 2020
| @@ -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.
just 1 nit: you can remove this here and log it in the newly added getDockerMajorVersion
There was a problem hiding this comment.
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.