From 29fc12607f47f7d68d8ca7e21b23e8dceca0c280 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 12 Oct 2017 16:50:47 +0100 Subject: [PATCH] Update various other go base pkgs to newer alpine (go1.9) These are those which set $GOPATH but don't use go-compile.sh. Signed-off-by: Ian Campbell --- pkg/init-lcow/Dockerfile | 4 ++-- pkg/vpnkit-expose-port/Dockerfile | 2 +- pkg/vpnkit-forwarder/Dockerfile | 2 +- pkg/vsudd/Dockerfile | 2 +- projects/kubernetes/cri-containerd/Dockerfile | 2 +- projects/kubernetes/kubernetes/Dockerfile | 2 +- projects/swarmd/swarmd/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index ede8f0b4c..3e7246097 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -7,7 +7,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs ENV OPENGCS_COMMIT=48ae4e3ba3d2fea746fb4dc20a72832a46f45466 RUN apk add --no-cache build-base curl git go musl-dev diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile index 3cd4269ff..0aeecbb6e 100644 --- a/pkg/vpnkit-expose-port/Dockerfile +++ b/pkg/vpnkit-expose-port/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile index ba0ef6729..08f798679 100644 --- a/pkg/vpnkit-forwarder/Dockerfile +++ b/pkg/vpnkit-forwarder/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index 528fe33e0..b7a9063a1 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/projects/kubernetes/cri-containerd/Dockerfile b/projects/kubernetes/cri-containerd/Dockerfile index 1c9dc0295..157575238 100644 --- a/projects/kubernetes/cri-containerd/Dockerfile +++ b/projects/kubernetes/cri-containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build RUN \ apk add \ diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index 622a0278a..ad187b0ff 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build ENV kubernetes_version v1.8.0 ENV cni_version v0.6.0 diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index 8982b39d9..3209b8ba2 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -2,7 +2,7 @@ FROM weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06 # Nothing to do in here, just for COPY --from=weave below -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build RUN \ apk update && apk upgrade && \ diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index e281dc5a0..6a57e9e1e 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror +FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \