Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/10/06 05:46:49... | ... |
@@ -3,6 +3,7 @@ |
3 | 3 |
ARG CROSS="false" |
4 | 4 |
ARG GO_VERSION=1.13.1 |
5 | 5 |
ARG DEBIAN_FRONTEND=noninteractive |
6 |
+ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e |
|
6 | 7 |
|
7 | 8 |
FROM golang:${GO_VERSION}-stretch AS base |
8 | 9 |
RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache |
... | ... |
@@ -240,6 +241,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ |
240 | 240 |
PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
241 | 241 |
COPY ./contrib/dockerd-rootless.sh /build |
242 | 242 |
|
243 |
+FROM djs55/vpnkit@sha256:${VPNKIT_DIGEST} AS vpnkit |
|
244 |
+ |
|
243 | 245 |
# TODO: Some of this is only really needed for testing, it would be nice to split this up |
244 | 246 |
FROM runtime-dev AS dev |
245 | 247 |
ARG DEBIAN_FRONTEND |
... | ... |
@@ -301,7 +304,7 @@ COPY --from=dockercli /build/ /usr/local/cli |
301 | 301 |
COPY --from=registry /build/registry* /usr/local/bin/ |
302 | 302 |
COPY --from=criu /build/ /usr/local/ |
303 | 303 |
COPY --from=rootlesskit /build/ /usr/local/bin/ |
304 |
-COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e /vpnkit /usr/local/bin/vpnkit.x86_64 |
|
304 |
+COPY --from=vpnkit /vpnkit /usr/local/bin/vpnkit.x86_64 |
|
305 | 305 |
|
306 | 306 |
ENV PATH=/usr/local/cli:$PATH |
307 | 307 |
ENV DOCKER_BUILDTAGS apparmor seccomp selinux |