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

[17.06.1] Backport engine userns secrets-mounting fix #121

Merged
merged 1 commit into from Jul 24, 2017

Conversation

Projects
None yet
5 participants
@cyli
Contributor

cyli commented Jul 18, 2017

This is a backport of moby/moby#34077. Cherry-pick moby/moby@3a1ab5b:

git cherry-pick -s -x -Xsubtree=components/engine 3a1ab5b

There was a conflict where it seems like the syscall had changed in engine master, but I just used the syscall import here.

cc @justincormack @tych0 @andrewhsu

In the case of remounting with changed data, need to call mount
The case where we are trying to do a remount with changed filesystem specific options was missing,
we need to call `mount` as well here to change those options.

See #33844 for where we need this, as we change `tmpfs` options.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 3a1ab5b)
Signed-off-by: Ying <ying.li@docker.com>

seemethere pushed a commit to seemethere/docker-ce that referenced this pull request Jul 20, 2017

Merge pull request docker#121 from nishanttotla/digest-pinning-stack-…
…deploy

Enable client side digest pinning for stack deploy
Upstream-commit: 4d980880f30eddec01dbe4328e0cd656a52b502b
Component: cli

@andrewhsu andrewhsu added this to the 17.06.1 milestone Jul 21, 2017

@thaJeztah

LGTM

ping @justincormack PTAL

@justincormack

This comment has been minimized.

Show comment
Hide comment
@justincormack

justincormack Jul 21, 2017

Member
Member

justincormack commented Jul 21, 2017

@cpuguy83

LGTM

@andrewhsu andrewhsu merged commit 19fe49f into docker:17.06 Jul 24, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 198 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 186 has succeeded
Details
dco-signed All commits are signed

@cyli cyli deleted the cyli:secrets-userns-fix branch Jul 24, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment