diff --git a/pkg/mount/Dockerfile b/pkg/mount/Dockerfile index 8b5098209..91ba6c327 100644 --- a/pkg/mount/Dockerfile +++ b/pkg/mount/Dockerfile @@ -1,11 +1,15 @@ -FROM alpine:3.5 +FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror -RUN \ - apk update && apk upgrade -a && \ - apk add --no-cache \ +FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 +COPY --from=mirror /etc/apk/repositories /etc/apk/repositories +COPY --from=mirror /etc/apk/keys /etc/apk/keys/ +COPY --from=mirror /mirror /mirror/ + +RUN apk add --no-cache \ jq \ sfdisk \ && true +RUN rm -rf /mirror /etc/apk/repositories /etc/apk/keys COPY . ./ CMD ["/bin/sh", "/mount.sh"] diff --git a/pkg/mount/Makefile b/pkg/mount/Makefile index 22d02f3c1..ac3a79cd7 100644 --- a/pkg/mount/Makefile +++ b/pkg/mount/Makefile @@ -1,29 +1,14 @@ .PHONY: tag push - -BASE=alpine:3.5 -IMAGE=mount - default: push -hash: Dockerfile mount.sh - DOCKER_CONTENT_TRUST=1 docker pull $(BASE) - tar cf - $^ | docker build --no-cache -t $(IMAGE):build - - docker run --rm --entrypoint /bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > $@ +IMAGE=mount +DEPS=Dockerfile mount.sh -push: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - docker push linuxkit/$(IMAGE):$(shell cat hash)) - docker rmi $(IMAGE):build - rm -f hash +HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') -tag: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) - docker rmi $(IMAGE):build - rm -f hash +tag: $(DEPS) + docker build --squash --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) . -clean: - rm -f hash - -.DELETE_ON_ERROR: +push: tag + docker pull linuxkit/$(IMAGE):$(HASH) || \ + docker push linuxkit/$(IMAGE):$(HASH)