Skip to content

Commit 1aec3ba

Browse files
mlaventuremlaventure
committed
Vendor in new runc binary with userns fix
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
1 parent 1f266d4 commit 1aec3ba

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ RUN set -x \
233233
&& rm -rf "$GOPATH"
234234

235235
# Install runc
236-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
236+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
237237
RUN set -x \
238238
&& 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" \
240240
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
241241
&& git checkout -q "$RUNC_COMMIT" \
242242
&& make static BUILDTAGS="seccomp apparmor selinux" \

‎Dockerfile.aarch64‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ RUN set -x \
180180
&& rm -rf "$GOPATH"
181181

182182
# Install runc
183-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
183+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
184184
RUN set -x \
185185
&& 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" \
187187
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
188188
&& git checkout -q "$RUNC_COMMIT" \
189189
&& make static BUILDTAGS="seccomp apparmor selinux" \

‎Dockerfile.armhf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ RUN set -x \
189189
&& rm -rf "$GOPATH"
190190

191191
# Install runc
192-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
192+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
193193
RUN set -x \
194194
&& 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" \
196196
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
197197
&& git checkout -q "$RUNC_COMMIT" \
198198
&& make static BUILDTAGS="seccomp apparmor selinux" \

‎Dockerfile.gccgo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ WORKDIR /go/src/github.com/docker/docker
7474
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
7575

7676
# Install runc
77-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
77+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
7878
RUN set -x \
7979
&& 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" \
8181
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
8282
&& git checkout -q "$RUNC_COMMIT" \
8383
&& make static BUILDTAGS="seccomp apparmor selinux" \

‎Dockerfile.ppc64le‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ RUN set -x \
204204
&& rm -rf "$GOPATH"
205205

206206
# Install runc
207-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
207+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
208208
RUN set -x \
209209
&& 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" \
211211
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
212212
&& git checkout -q "$RUNC_COMMIT" \
213213
&& make static BUILDTAGS="apparmor seccomp selinux" \

‎Dockerfile.s390x‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ RUN set -x \
197197
&& rm -rf "$GOPATH"
198198

199199
# Install runc
200-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
200+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
201201
RUN set -x \
202202
&& 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" \
204204
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
205205
&& git checkout -q "$RUNC_COMMIT" \
206206
&& make static BUILDTAGS="seccomp apparmor selinux" \

‎Dockerfile.simple‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
5757
ENV CGO_LDFLAGS -L/lib
5858

5959
# Install runc
60-
ENV RUNC_COMMIT 85873d917e86676e44ccb80719fcb47a794676a1
60+
ENV RUNC_COMMIT 5ce88a95f6cf218ba7f3309562f95464a968e890
6161
RUN set -x \
6262
&& 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" \
6464
&& cd "$GOPATH/src/github.com/opencontainers/runc" \
6565
&& git checkout -q "$RUNC_COMMIT" \
6666
&& make static BUILDTAGS="seccomp apparmor selinux" \

0 commit comments

Comments
 (0)