Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit edc3150

Browse files
committed
Dockerfile: use build-arg for vpnkit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1cfcce5e210ad7a0296fe341b3dda40a0af06c12) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: cb813faebf78272db9db67869ae1fb5f06f0e2e1 Component: engine
1 parent c393955 commit edc3150

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

components/engine/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ARG CROSS="false"
2828
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
2929
ARG GO_VERSION=1.12.17
3030
ARG DEBIAN_FRONTEND=noninteractive
31+
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
3132

3233
FROM golang:${GO_VERSION}-stretch AS base
3334
ARG APT_MIRROR
@@ -235,6 +236,8 @@ COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
235236
RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME
236237
COPY ./contrib/dockerd-rootless.sh /build
237238

239+
FROM djs55/vpnkit@sha256:${VPNKIT_DIGEST} AS vpnkit
240+
238241
# TODO: Some of this is only really needed for testing, it would be nice to split this up
239242
FROM runtime-dev AS dev
240243
ARG DEBIAN_FRONTEND
@@ -294,7 +297,7 @@ COPY --from=dockercli /build/ /usr/local/cli
294297
COPY --from=registry /build/registry* /usr/local/bin/
295298
COPY --from=criu /build/ /usr/local/
296299
COPY --from=rootlesskit /build/ /usr/local/bin/
297-
COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e /vpnkit /usr/local/bin/vpnkit.x86_64
300+
COPY --from=vpnkit /vpnkit /usr/local/bin/vpnkit.x86_64
298301

299302
ENV PATH=/usr/local/cli:$PATH
300303
ENV DOCKER_BUILDTAGS apparmor seccomp selinux

0 commit comments

Comments
 (0)