[18.09 backport] builder / buildkit updates#1438
Merged
tiborvass merged 4 commits intodocker:18.09from Oct 11, 2018
Merged
Conversation
Member
Author
|
ping @tiborvass @tonistiigi PTAL (assuming this was intended to the 18.09 branch as well)
discussed with @tiborvass and we also need the buildkit updates from that PR, so included #1419 |
Codecov Report
@@ Coverage Diff @@
## 18.09 #1438 +/- ##
==========================================
- Coverage 54.13% 54.05% -0.08%
==========================================
Files 290 290
Lines 19344 19385 +41
==========================================
+ Hits 10472 10479 +7
- Misses 8203 8237 +34
Partials 669 669 |
thaJeztah
changed the title
thaJeztah
force-pushed
the
18.09_backport_hide-buildkit-flags-if-not-enabled
branch
from
7e3829c to
840ce44
Compare
This comment has been minimized.
This comment has been minimized.
thaJeztah
force-pushed
the
18.09_backport_hide-buildkit-flags-if-not-enabled
branch
from
840ce44 to
745134d
Compare
Member
Author
|
Fixed the vendoring issues; looks like we didn't include some vendoring bumps in the 18.09 branch; adding those both made the cherry-pick clean, and brought the expected versions |
tonistiigi
approved these changes
Oct 11, 2018
…7afe5 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 8cfd240) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit 846c38c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…D=$SSH_AUTH_SOCK`) Unlike `docker build --secret`, `docker build --ssh` allows the build container to use SSH keys with passphrases. $ eval $(ssh-agent) $ ssh-add ~/.ssh/id_rsa (Input your passphrase here) $ docker build --ssh default=$SSH_AUTH_SOCK ... This feature requires the daemon with `CapExecMountSSH` build capability (moby/moby#37973) . Currently, the official Dockerfile frontend does not provide the syntax for using the SSH forwarder. However, the experimental `RUN --mount=type=ssh` syntax can be enabled by using the Dockerfile frontend image built with the `BUILDTAGS="dfrunmount dfssh"`, via the `# syntax =` "shebang". The Dockerfile for the Dockerfile frontend is available at github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend) The pre-built image is also available as `tonistiigi/dockerfile:ssh20181002` . An example Dockerfile with `RUN --mount=type=ssh`: # syntax = tonistiigi/dockerfile:ssh20181002 FROM alpine RUN apk add --no-cache openssh-client RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan gitlab.com >> ~/.ssh/known_hosts RUN --mount=type=ssh ssh git@gitlab.com | tee /hello # "Welcome to GitLab, @GITLAB_USERNAME_ASSOCIATED_WITH_SSHKEY" should be printed here More info available at moby/buildkit#608, moby/buildkit#655 Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit db7399a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit bbd01fe) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.09_backport_hide-buildkit-flags-if-not-enabled
branch
from
745134d to
3dfacb5
Compare
thaJeztah
deleted the
18.09_backport_hide-buildkit-flags-if-not-enabled
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
backport of #1419, #1427, and some commits from #1393 for 18.09
Took the buildkit-bump commit from #1393, but left out the other bumps