From 00a2f2ac8caca2b10f0b61bfe0116892c5f2687d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 14 Jul 2017 11:32:28 +0100 Subject: [PATCH] alpine: stash the original /etc/apk/repositories for downstream use If a user of linuxkit/alpine wants to produce an image with apk in it then it is useful for them to have the original upstream repository list. The new hash is linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 9d84cb095..2018615b4 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -27,8 +27,8 @@ RUN abuild-sign /mirror/$(uname -m)/APKINDEX.tar.gz # fetch OVMF for qemu EFI boot (this is not added as a package) RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf -# set this as our repo -RUN echo "/mirror" > /etc/apk/repositories && apk update +# set this as our repo but keep a copy of the upstream for downstream use +RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > /etc/apk/repositories && apk update # add Go validation tools COPY go-compile.sh /go/bin/ @@ -41,6 +41,7 @@ RUN go get -u github.com/LK4D4/vndr FROM alpine:3.6 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories +COPY --from=mirror /etc/apk/repositories.upstream /etc/apk/repositories.upstream COPY --from=mirror /etc/apk/keys /etc/apk/keys/ COPY --from=mirror /mirror /mirror/ COPY --from=mirror /go/bin /go/bin/