Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

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

Merged
merged 1 commit into from
Jul 24, 2017
Merged

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

merged 1 commit into from
Jul 24, 2017

Conversation

cyli
Copy link
Contributor

@cyli 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

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
…g-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
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ping @justincormack PTAL

@justincormack
Copy link
Contributor

justincormack commented Jul 21, 2017 via email

Copy link
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 19fe49f into docker-archive:17.06 Jul 24, 2017
@cyli cyli deleted the secrets-userns-fix branch July 24, 2017 21:38
docker-jenkins pushed a commit that referenced this pull request Oct 24, 2018
Add initial scripts for Ubuntu Cosmic (18.10)
Upstream-commit: 06bb2c7
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 27, 2018
[18.09 backport] Update containerd to v1.2.1-rc.0
Upstream-commit: c95cf2a5d36b5448e4771a29f2ad72214a2311dd
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06.1] Backport engine userns secrets-mounting fix
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Add initial scripts for Ubuntu Cosmic (18.10)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants