This includes fixes for;
- outputing errors for missing seccomp options on seccomp versions < 2.3
- cap set apply EPERM errors on ARM systems
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 752b31d3fe6fcbea9e14247c3896334734eba7f2)
| ... | ... |
@@ -247,7 +247,7 @@ RUN set -x \ |
| 247 | 247 |
&& rm -rf "$GOPATH" |
| 248 | 248 |
|
| 249 | 249 |
# Install runc |
| 250 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 250 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 251 | 251 |
RUN set -x \ |
| 252 | 252 |
&& export GOPATH="$(mktemp -d)" \ |
| 253 | 253 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -181,7 +181,7 @@ RUN set -x \ |
| 181 | 181 |
&& rm -rf "$GOPATH" |
| 182 | 182 |
|
| 183 | 183 |
# Install runc |
| 184 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 184 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 185 | 185 |
RUN set -x \ |
| 186 | 186 |
&& export GOPATH="$(mktemp -d)" \ |
| 187 | 187 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -198,7 +198,7 @@ RUN set -x \ |
| 198 | 198 |
&& rm -rf "$GOPATH" |
| 199 | 199 |
|
| 200 | 200 |
# Install runc |
| 201 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 201 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 202 | 202 |
RUN set -x \ |
| 203 | 203 |
&& export GOPATH="$(mktemp -d)" \ |
| 204 | 204 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -74,7 +74,7 @@ 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 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 77 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 78 | 78 |
RUN set -x \ |
| 79 | 79 |
&& export GOPATH="$(mktemp -d)" \ |
| 80 | 80 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -199,7 +199,7 @@ RUN set -x \ |
| 199 | 199 |
&& rm -rf "$GOPATH" |
| 200 | 200 |
|
| 201 | 201 |
# Install runc |
| 202 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 202 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 203 | 203 |
RUN set -x \ |
| 204 | 204 |
&& export GOPATH="$(mktemp -d)" \ |
| 205 | 205 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -178,7 +178,7 @@ RUN set -x \ |
| 178 | 178 |
&& rm -rf "$GOPATH" |
| 179 | 179 |
|
| 180 | 180 |
# Install runc |
| 181 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 181 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 182 | 182 |
RUN set -x \ |
| 183 | 183 |
&& export GOPATH="$(mktemp -d)" \ |
| 184 | 184 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |
| ... | ... |
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 30 | 30 |
&& rm -rf /var/lib/apt/lists/* |
| 31 | 31 |
|
| 32 | 32 |
# Install runc |
| 33 |
-ENV RUNC_COMMIT 5439bd2d95229c4e213a219174c7b9da284e3487 |
|
| 33 |
+ENV RUNC_COMMIT 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa |
|
| 34 | 34 |
RUN set -x \ |
| 35 | 35 |
&& export GOPATH="$(mktemp -d)" \ |
| 36 | 36 |
&& git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |