github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2205 from ijc/alpine-repo-and-hash

Browse Source 
Small alpine mirror improvements
This commit is contained in:
Justin Cormack 2017-07-14 14:24:55 +01:00 committed by GitHub
commit a6b1718490
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/alpine/Dockerfile
View File

@ -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) # 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 RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf
# set this as our repo # set this as our repo but keep a copy of the upstream for downstream use
RUN echo "/mirror" > /etc/apk/repositories && apk update RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > /etc/apk/repositories && apk update
# add Go validation tools # add Go validation tools
COPY go-compile.sh /go/bin/ COPY go-compile.sh /go/bin/
@ -41,6 +41,7 @@ RUN go get -u github.com/LK4D4/vndr
FROM alpine:3.6 FROM alpine:3.6
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories 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 /etc/apk/keys /etc/apk/keys/
COPY --from=mirror /mirror /mirror/ COPY --from=mirror /mirror /mirror/
COPY --from=mirror /go/bin /go/bin/ COPY --from=mirror /go/bin /go/bin/

6
tools/alpine/Makefile
View File

@ -6,6 +6,9 @@ BASE=alpine:3.6
default: push default: push
show-tag:
@sed -n -e '1s/# \(.*\/.*:[0-9a-f]\{40\}\)/\1/p;q' versions
hash: Dockerfile Makefile packages hash: Dockerfile Makefile packages
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
docker build --no-cache -t $(IMAGE):build . docker build --no-cache -t $(IMAGE):build .
@ -15,7 +18,8 @@ push: hash
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) && \ (docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) && \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(shell cat hash)) DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(shell cat hash))
docker run --rm $(IMAGE):build find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) > versions echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions
docker run --rm $(IMAGE):build find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions
docker rmi $(IMAGE):build docker rmi $(IMAGE):build
rm -f hash rm -f hash

1
tools/alpine/versions
View File

@ -1,3 +1,4 @@
# linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.0.0_rc2-r7 abuild-3.0.0_rc2-r7
alpine-baselayout-3.0.4-r0 alpine-baselayout-3.0.4-r0