summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-12-04 12:08:20 -0800
committerGitHub <noreply@github.com>2018-12-04 12:08:20 -0800
commita01a590ae8ea817ff38c30cf4b534c17584aaec2 (patch)
treef178302c26e22c23ad09be4b98306f3800b1a7b1
parentf1770ea0ef7abf0c7d6ab5cf1dbdcbf1eafc27c0 (diff)
parenta90f2218dcb6c7870c800636267407b398b821ed (diff)
downloadpodman-a01a590ae8ea817ff38c30cf4b534c17584aaec2.tar.gz
podman-a01a590ae8ea817ff38c30cf4b534c17584aaec2.tar.bz2
podman-a01a590ae8ea817ff38c30cf4b534c17584aaec2.zip
Merge pull request #1933 from giuseppe/update-runc-again
test: update runc again
-rw-r--r--.cirrus.yml2
-rw-r--r--Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 304efb2f4..625b96fdd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,7 +20,7 @@ env:
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CRIO_COMMIT: "7a283c391abb7bd25086a8ff91dbb36ebdd24466"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
- RUNC_COMMIT: "869add33186caff4a22e3e11a7472a2d48d77889"
+ RUNC_COMMIT: "96ec2177ae841256168fcf76954f7177af9446eb"
# 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 e1d7b4649..08af0f851 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 869add33186caff4a22e3e11a7472a2d48d77889
+ENV RUNC_COMMIT 96ec2177ae841256168fcf76954f7177af9446eb
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \