Browse code
Vendor in new runc binary with userns fix
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Kenfe-Mickael Laventure authored on 2016/06/14 11:33:00Showing 7 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.gccgo
- Dockerfile.ppc64le
- Dockerfile.s390x
- Dockerfile.simple
| ... | ... |
@@ -233,10 +233,10 @@ RUN set -x \ |
| 233 | 233 |
&& rm -rf "$GOPATH" |
| 234 | 234 |
|
| 235 | 235 |
# Install runc |
| 236 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 236 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 237 | 237 |
RUN set -x \ |
| 238 | 238 |
&& export GOPATH="$(mktemp -d)" \ |
| 239 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 239 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 240 | 240 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 241 | 241 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 242 | 242 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |
| ... | ... |
@@ -180,10 +180,10 @@ RUN set -x \ |
| 180 | 180 |
&& rm -rf "$GOPATH" |
| 181 | 181 |
|
| 182 | 182 |
# Install runc |
| 183 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 183 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 184 | 184 |
RUN set -x \ |
| 185 | 185 |
&& export GOPATH="$(mktemp -d)" \ |
| 186 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 186 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 187 | 187 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 188 | 188 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 189 | 189 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |
| ... | ... |
@@ -189,10 +189,10 @@ RUN set -x \ |
| 189 | 189 |
&& rm -rf "$GOPATH" |
| 190 | 190 |
|
| 191 | 191 |
# Install runc |
| 192 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 192 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 193 | 193 |
RUN set -x \ |
| 194 | 194 |
&& export GOPATH="$(mktemp -d)" \ |
| 195 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 195 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 196 | 196 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 197 | 197 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 198 | 198 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |
| ... | ... |
@@ -74,10 +74,10 @@ WORKDIR /go/src/github.com/docker/docker |
| 74 | 74 |
ENV DOCKER_BUILDTAGS apparmor seccomp selinux |
| 75 | 75 |
|
| 76 | 76 |
# Install runc |
| 77 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 77 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 78 | 78 |
RUN set -x \ |
| 79 | 79 |
&& export GOPATH="$(mktemp -d)" \ |
| 80 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 80 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 81 | 81 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 82 | 82 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 83 | 83 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |
| ... | ... |
@@ -204,10 +204,10 @@ RUN set -x \ |
| 204 | 204 |
&& rm -rf "$GOPATH" |
| 205 | 205 |
|
| 206 | 206 |
# Install runc |
| 207 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 207 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 208 | 208 |
RUN set -x \ |
| 209 | 209 |
&& export GOPATH="$(mktemp -d)" \ |
| 210 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 210 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 211 | 211 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 212 | 212 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 213 | 213 |
&& make static BUILDTAGS="apparmor seccomp selinux" \ |
| ... | ... |
@@ -197,10 +197,10 @@ RUN set -x \ |
| 197 | 197 |
&& rm -rf "$GOPATH" |
| 198 | 198 |
|
| 199 | 199 |
# Install runc |
| 200 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 200 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 201 | 201 |
RUN set -x \ |
| 202 | 202 |
&& export GOPATH="$(mktemp -d)" \ |
| 203 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 203 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 204 | 204 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 205 | 205 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 206 | 206 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |
| ... | ... |
@@ -57,10 +57,10 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor |
| 57 | 57 |
ENV CGO_LDFLAGS -L/lib |
| 58 | 58 |
|
| 59 | 59 |
# Install runc |
| 60 |
-ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1 |
|
| 60 |
+ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890 |
|
| 61 | 61 |
RUN set -x \ |
| 62 | 62 |
&& export GOPATH="$(mktemp -d)" \ |
| 63 |
- && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 63 |
+ && git clone https://github.com/crosbymichael/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
|
| 64 | 64 |
&& cd "$GOPATH/src/github.com/opencontainers/runc" \ |
| 65 | 65 |
&& git checkout -q "$RUNC_COMMIT" \ |
| 66 | 66 |
&& make static BUILDTAGS="seccomp apparmor selinux" \ |