-
Notifications
You must be signed in to change notification settings - Fork 422
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(docker): docker build failed when multiple Dockerfile in one dir #980
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
iamhopaul123
requested review from
kohidave,
efekarakus,
Louise15926,
bvtujo,
SoManyHs,
seongm-1,
huanjani and
a team
May 29, 2020 22:18
kohidave
reviewed
May 29, 2020
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.
Thanks for your super quick turn around!
iamhopaul123
force-pushed
the
docker/bug-fix
branch
2 times, most recently
from
May 30, 2020 19:33
fb299fb
to
77439cb
Compare
efekarakus
added
the
do-not-merge
Pull requests that mergify shouldn't merge until the requester allows it.
label
Jun 1, 2020
efekarakus
approved these changes
Jun 1, 2020
|
||
err := s.runner.Run("docker", []string{"build", "-t", imageName, path}) | ||
err := r.Run("docker", []string{"build", "-t", imageName, dfPath, "-f", dfName}) |
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.
awesome tyty 🙏
iamhopaul123
force-pushed
the
docker/bug-fix
branch
from
June 1, 2020 21:41
77439cb
to
5bf3823
Compare
iamhopaul123
removed
the
do-not-merge
Pull requests that mergify shouldn't merge until the requester allows it.
label
Jun 1, 2020
kohidave
approved these changes
Jun 1, 2020
mergify bot
pushed a commit
that referenced
this pull request
Jun 6, 2020
<!-- Provide summary of changes --> With #980, we fixed an issue which occurred when there were multiple dockerfiles present in the build directory. However, this may have broken our end to end tests, because the call to Docker was formatted as the following: ```sh docker build -t <imageTag> path/to -f Dockerfile ``` This should be fine, but the end to end tests began to fail on Monday with the following output: ```bash addons flow when deploying svc svc deploy should succeed /github.com/aws/amazon-ecs-cli-v2/e2e/addons/addons_test.go:145 unable to prepare context: unable to evaluate symlinks in Dockerfile path: lstat /github.com/aws/amazon-ecs-cli-v2/e2e/addons/Dockerfile: no such file or directory Error: build Dockerfile at ./hello/Dockerfile with tag gallopinggurdey: building image: exit status 1 ``` This indicates that although the Dockerfile path was set to `hello/Dockerfile`, Docker was looking for the file somewhere in the root directory of that path (.) and subsequently failing. This fix always sets the dockerfile path to be relative to the *root* of the docker build context, not the *leaf* of the build context. (previously we were parsing paths like `path/to/dockerfile` into `path/to` and `dockerfile`, assuming that the dockerfile would be searched for in `path/to`, not `path`. This was incorrect.) The new behavior is to call: ```sh docker build -t <imageTag> path/to -f path/to/dockerfile ``` <!-- Issue number, if available. E.g. "Fixes #31", "Addresses #42, 77" --> By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
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.
Fix #979
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.