From 1aec3bacfd754e1ed72ec5a59dfd20d653f794a3 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Mon, 13 Jun 2016 19:33:00 -0700 Subject: [PATCH] Vendor in new runc binary with userns fix Signed-off-by: Kenfe-Mickael Laventure --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- Dockerfile.gccgo | 4 ++-- Dockerfile.ppc64le | 4 ++-- Dockerfile.s390x | 4 ++-- Dockerfile.simple | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00861ec26f..ab58e3732f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -233,10 +233,10 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0011ad617c..2333d474fe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -180,10 +180,10 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d5462eddcb..08b4d31d4d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -189,10 +189,10 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo index 98011d9223..03e8a2afae 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -74,10 +74,10 @@ WORKDIR /go/src/github.com/docker/docker ENV DOCKER_BUILDTAGS apparmor seccomp selinux # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index a8e1708287..4ceed03da4 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -204,10 +204,10 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="apparmor seccomp selinux" \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 8f887b2702..ebb72c91c5 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -197,10 +197,10 @@ RUN set -x \ && rm -rf "$GOPATH" # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 2c19fd249c..00d53bdf06 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -57,10 +57,10 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor ENV CGO_LDFLAGS -L/lib # Install runc -ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 +ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \