Update all users of go-compile.sh to new alpine (go1.9)

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-12 16:47:35 +01:00
parent aba82533a0
commit a9b03c3f95
12 changed files with 17 additions and 17 deletions

View File

@ -1,10 +1,10 @@
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS qemu FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS qemu
RUN apk add \ RUN apk add \
qemu-aarch64 \ qemu-aarch64 \
qemu-arm \ qemu-arm \
qemu-ppc64le qemu-ppc64le
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror
RUN apk add --no-cache go musl-dev RUN apk add --no-cache go musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

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 \
@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \
&& true && true
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
RUN apk add --no-cache go musl-dev RUN apk add --no-cache go musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

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 \
@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \
&& true && true
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
RUN apk add --no-cache go musl-dev RUN apk add --no-cache go musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

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

View File

@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service RUN go-compile.sh /go/src/cmd/service
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 alpine-baselayout busybox musl RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl

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

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 \
@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \
&& true && true
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
RUN apk add --no-cache go musl-dev RUN apk add --no-cache go musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS mirror FROM linuxkit/alpine:6211ec0252873c9ff9604101fb256353f5a3832a AS mirror
RUN apk add --no-cache go gcc musl-dev linux-headers RUN apk add --no-cache go gcc musl-dev linux-headers
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

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

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

View File

@ -1,5 +1,5 @@
# We need the `fstrim` binary: # We need the `fstrim` binary:
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 \

View File

@ -1,10 +1,10 @@
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 \
tini tini
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
RUN apk add --no-cache go musl-dev git make RUN apk add --no-cache go musl-dev git make
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin