Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1cfcce5e210ad7a0296fe341b3dda40a0af06c12)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
... | ... |
@@ -28,6 +28,7 @@ ARG CROSS="false" |
28 | 28 |
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored |
29 | 29 |
ARG GO_VERSION=1.12.17 |
30 | 30 |
ARG DEBIAN_FRONTEND=noninteractive |
31 |
+ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e |
|
31 | 32 |
|
32 | 33 |
FROM golang:${GO_VERSION}-stretch AS base |
33 | 34 |
ARG APT_MIRROR |
... | ... |
@@ -235,6 +236,8 @@ COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
235 | 235 |
RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
236 | 236 |
COPY ./contrib/dockerd-rootless.sh /build |
237 | 237 |
|
238 |
+FROM djs55/vpnkit@sha256:${VPNKIT_DIGEST} AS vpnkit |
|
239 |
+ |
|
238 | 240 |
# TODO: Some of this is only really needed for testing, it would be nice to split this up |
239 | 241 |
FROM runtime-dev AS dev |
240 | 242 |
ARG DEBIAN_FRONTEND |
... | ... |
@@ -294,7 +297,7 @@ COPY --from=dockercli /build/ /usr/local/cli |
294 | 294 |
COPY --from=registry /build/registry* /usr/local/bin/ |
295 | 295 |
COPY --from=criu /build/ /usr/local/ |
296 | 296 |
COPY --from=rootlesskit /build/ /usr/local/bin/ |
297 |
-COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e /vpnkit /usr/local/bin/vpnkit.x86_64 |
|
297 |
+COPY --from=vpnkit /vpnkit /usr/local/bin/vpnkit.x86_64 |
|
298 | 298 |
|
299 | 299 |
ENV PATH=/usr/local/cli:$PATH |
300 | 300 |
ENV DOCKER_BUILDTAGS apparmor seccomp selinux |