diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-11-30 11:31:56 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-11-30 22:45:55 +0100 |
| commit | 2dfb7c02b16471c23ef8d0c8b0ede686560e4d2c (patch) | |
| tree | 889d71b07a843caf4bdf86f7d8847289c9456c0f | |
| parent | 1d2e1eece5ccb62c731e4d84d451a6b544c3389a (diff) | |
| download | podman-2dfb7c02b16471c23ef8d0c8b0ede686560e4d2c.tar.gz podman-2dfb7c02b16471c23ef8d0c8b0ede686560e4d2c.tar.bz2 podman-2dfb7c02b16471c23ef8d0c8b0ede686560e4d2c.zip | |
Dockerfile, .cirrus.yml: update runc commit
we need to inherit this change from runc.
commit 869add33186caff4a22e3e11a7472a2d48d77889:
rootless: fix running with /proc/self/setgroups set to deny
This is a regression from 06f789cf26774dd64cb2a9cc0b3c6a6ff832733b
when the user namespace was configured without a privileged helper.
To allow a single mapping in an user namespace, it is necessary to set
/proc/self/setgroups to "deny".
For a simple reproducer, the user namespace can be created with
"unshare -r".
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d4d978a81..0bdcb8db1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,7 +20,7 @@ env: CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CRIO_COMMIT: "7a283c391abb7bd25086a8ff91dbb36ebdd24466" CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" - RUNC_COMMIT: "78ef28e63bec2ee4c139b5e3e0d691eb9bdc748d" + RUNC_COMMIT: "869add33186caff4a22e3e11a7472a2d48d77889" # File to update in home-dir with task-specific env. var values ENVLIB: ".bash_profile" # Overrides default location (/tmp/cirrus) for repo clone diff --git a/Dockerfile b/Dockerfile index 3eb7b0a07..e1d7b4649 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ ADD . /go/src/github.com/containers/libpod RUN set -x && cd /go/src/github.com/containers/libpod && make install.libseccomp.sudo # Install runc -ENV RUNC_COMMIT 78ef28e63bec2ee4c139b5e3e0d691eb9bdc748d +ENV RUNC_COMMIT 869add33186caff4a22e3e11a7472a2d48d77889 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |