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

Merge pull request #2260 from ijc/tools-alpine-iidfile

Browse Source 
alpine: Use `docker build --iidfile`
This commit is contained in:
Justin Cormack 2017-07-24 16:14:35 +01:00 committed by GitHub
commit c1c0659d6c
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/alpine/Dockerfile
View File

@ -9,7 +9,7 @@ COPY Dockerfile /Dockerfile
COPY packages* /tmp/ COPY packages* /tmp/
# mirror packages # mirror packages
RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \ RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
mkdir -p /mirror/$(uname -m) && \ mkdir -p /mirror/$(uname -m) && \
apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages) apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages)
@ -30,7 +30,7 @@ RUN cp /mirror/$(uname -m)/APKINDEX.unsigned.tar.gz /mirror/$(uname -m)/APKINDEX
RUN abuild-sign /mirror/$(uname -m)/APKINDEX.tar.gz 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 mkdir -p /usr/share/ovmf && \ RUN mkdir -p /usr/share/ovmf && \
if [ $(uname -m) = x86_64 ]; then \ if [ $(uname -m) = x86_64 ]; then \
apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf; \ apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf; \
fi fi

38
tools/alpine/Makefile
View File

@ -6,12 +6,14 @@ IMAGE=alpine
DOCKER_CONTENT_VAR=1 DOCKER_CONTENT_VAR=1
PKG_DEPS=packages PKG_DEPS=packages
ifeq ($(shell uname -m), x86_64) ARCH := $(shell uname -m)
ifeq ($(ARCH), x86_64)
BASE=alpine:3.6 BASE=alpine:3.6
PKG_DEPS += packages.x86_64 PKG_DEPS += packages.x86_64
endif endif
ifeq ($(shell uname -m), aarch64) ifeq ($(ARCH), aarch64)
BASE=arm64v8/alpine:3.6 BASE=arm64v8/alpine:3.6
PKG_DEPS += packages.aarch64 PKG_DEPS += packages.aarch64
DOCKER_CONTENT_VAR=0 DOCKER_CONTENT_VAR=0
@ -20,27 +22,29 @@ endif
default: push default: push
show-tag: show-tag:
@sed -n -e '1s/# \(.*\/.*:[0-9a-f]\{40\}\)/\1/p;q' versions.$(shell uname -m) @sed -n -e '1s/# \(.*\/.*:[0-9a-f]\{40\}\)/\1/p;q' versions.$(ARCH)
hash: Dockerfile Makefile $(PKG_DEPS) iid: Dockerfile Makefile $(PKG_DEPS)
DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker pull $(BASE) DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker pull $(BASE)
docker build --no-cache --build-arg BASE=$(BASE) -t $(IMAGE):build . docker build --no-cache --build-arg BASE=$(BASE) --iidfile iid .
docker run --rm $(IMAGE):build sh -c 'echo Dockerfile /lib/apk/db/installed $$(find /mirror -name '*.apk' -type f) $$(find /go/bin -type f) | xargs cat | sha1sum' | sed 's/ .*//' > $@
push: hash hash: Makefile iid
docker run --rm $(shell cat iid) sh -c 'echo Dockerfile /lib/apk/db/installed $$(find /mirror -name '*.apk' -type f) $$(find /go/bin -type f) | xargs cat | sha1sum' | sed 's/ .*//' > $@
versions.$(ARCH): Makefile hash iid
echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH)
docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH)
push: hash iid versions.$(ARCH)
DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) && \ (docker tag $(shell cat iid) $(ORG)/$(IMAGE):$(shell cat hash) && \
DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker push $(ORG)/$(IMAGE):$(shell cat hash)) DOCKER_CONTENT_TRUST=$(DOCKER_CONTENT_VAR) docker push $(ORG)/$(IMAGE):$(shell cat hash))
echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(shell uname -m) rm -f iid
docker run --rm $(IMAGE):build find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(shell uname -m)
docker rmi $(IMAGE):build
rm -f hash
tag: hash tag: hash iid versions.$(ARCH)
docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) docker tag $(shell cat iid) $(ORG)/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build rm -f iid
rm -f hash
clean: clean:
rm -f hash rm -f hash iid