github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-04 07:38:28 +00:00
Code Issues Projects Releases Wiki Activity

Update various other go base pkgs to newer alpine (go1.9)

Browse Source 
These are those which set $GOPATH but don't use go-compile.sh.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-10-12 16:50:47 +01:00
parent a9b03c3f95
commit 29fc12607f
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/init-lcow/Dockerfile
View File

@@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \ alpine-baselayout \
@@ -7,7 +7,7 @@ RUN apk add --no-cache --initdb -p /out \
musl musl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache 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_REPO=https://github.com/Microsoft/opengcs
ENV OPENGCS_COMMIT=48ae4e3ba3d2fea746fb4dc20a72832a46f45466 ENV OPENGCS_COMMIT=48ae4e3ba3d2fea746fb4dc20a72832a46f45466
RUN apk add --no-cache build-base curl git go musl-dev RUN apk add --no-cache build-base curl git go musl-dev

2
pkg/vpnkit-expose-port/Dockerfile
View File

@@ -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 RUN apk add --no-cache go musl-dev git build-base
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

2
pkg/vpnkit-forwarder/Dockerfile
View File

@@ -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 RUN apk add --no-cache go musl-dev git build-base
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

2
pkg/vsudd/Dockerfile
View File

@@ -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 RUN apk add --no-cache go musl-dev git build-base
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

2
projects/kubernetes/cri-containerd/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build
RUN \ RUN \
apk add \ apk add \

2
projects/kubernetes/kubernetes/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build
ENV kubernetes_version v1.8.0 ENV kubernetes_version v1.8.0
ENV cni_version v0.6.0 ENV cni_version v0.6.0

2
projects/swarmd/swarmd/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06
# Nothing to do in here, just for COPY --from=weave below # Nothing to do in here, just for COPY --from=weave below
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS build
RUN \ RUN \
apk update && apk upgrade && \ apk update && apk upgrade && \

2
test/pkg/ns/Dockerfile
View File

@@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \ alpine-baselayout \