Shell out docker build #840
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
dgageot
force-pushed
the
shell-out-docker-build
branch
2 times, most recently
from
4f92d9c to
b1ae16a
Compare
nkubala
reviewed
Jul 23, 2018
examples/annotated-skaffold.yaml
Outdated
| # Pushing the images can be skipped. If no value is specified, it'll default to | ||
| # `true` on minikube or Docker for Desktop, for even faster build and deploy cycles. | ||
| # `false` on other types of kubernetes clusters that require pushing the images. | ||
| # kaffold defers to your ~/.docker/config for authentication information. |
pkg/skaffold/build/docker.go
Outdated
| if l.cfg.UseDockerCLI || l.cfg.UseBuildkit { | ||
| absDockerfilePath := a.DockerfilePath | ||
| if !filepath.IsAbs(a.DockerfilePath) { | ||
| absDockerfilePath = filepath.Join(workspace, a.DockerfilePath) |
There was a problem hiding this comment.
I think you also need to be sure you don't append the workspace twice, since the workspace itself can also be a relative path. I did this here, you could pull this out into a util package and reuse it here.
There was a problem hiding this comment.
Good point. I'll do that
dgageot
force-pushed
the
shell-out-docker-build
branch
from
b1ae16a to
d36ed59
Compare
Fix the case where a build arg has no value. Signed-off-by: David Gageot <[email protected]>
Signed-off-by: David Gageot <[email protected]>
dgageot
force-pushed
the
shell-out-docker-build
branch
from
d36ed59 to
d83d107
Compare
nkubala
approved these changes
Jul 23, 2018
pkg/skaffold/docker/context.go
Outdated
|
|
||
| cstorage "cloud.google.com/go/storage" | ||
| "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // NormalizeDockerfilePath returns the abolute path to the dockerfile. |
Signed-off-by: David Gageot <[email protected]>
dgageot
force-pushed
the
shell-out-docker-build
branch
from
d83d107 to
d1fba60
Compare
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.
Support an alternative way of building locally by running
docker builddirectly. This is also a good opportunity to let the user enable experimental buildkit.