From 28905c57cc50ea60566a06715c0da435dcc47825 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 14 Jul 2017 11:49:42 +0100 Subject: [PATCH] alpine: Record image has in versions file Otherwise the only record is if the pusher happens to remember to put it in the commit message (tollerable) or the github PR (not great). Also add the same show-tag target as `pkg/package.mk` supports, although with a very different implementation. The actual hash is unchanged from the previous commit. Signed-off-by: Ian Campbell --- tools/alpine/Makefile | 6 +++++- tools/alpine/versions | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile index 6769afad4..25624ba4d 100644 --- a/tools/alpine/Makefile +++ b/tools/alpine/Makefile @@ -6,6 +6,9 @@ BASE=alpine:3.6 default: push +show-tag: + @sed -n -e '1s/# \(.*\/.*:[0-9a-f]\{40\}\)/\1/p;q' versions + hash: Dockerfile Makefile packages DOCKER_CONTENT_TRUST=1 docker pull $(BASE) 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 tag $(IMAGE):build $(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 rm -f hash diff --git a/tools/alpine/versions b/tools/alpine/versions index b14adcee4..0fa55b7fa 100644 --- a/tools/alpine/versions +++ b/tools/alpine/versions @@ -1,3 +1,4 @@ +# linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73 # automatically generated list of installed packages abuild-3.0.0_rc2-r7 alpine-baselayout-3.0.4-r0