github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 05:52:56 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Convert mount to use the Alpine base and git tree hash

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-05-04 14:46:58 +01:00
parent fce13fb48d
commit 1748a69f2a
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/mount/Dockerfile
View File

@@ -1,11 +1,15 @@
FROM alpine:3.5 FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
RUN \ FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
apk update && apk upgrade -a && \ COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
apk add --no-cache \ COPY --from=mirror /etc/apk/keys /etc/apk/keys/
COPY --from=mirror /mirror /mirror/
RUN apk add --no-cache \
jq \ jq \
sfdisk \ sfdisk \
&& true && true
RUN rm -rf /mirror /etc/apk/repositories /etc/apk/keys
COPY . ./ COPY . ./
CMD ["/bin/sh", "/mount.sh"] CMD ["/bin/sh", "/mount.sh"]

31
pkg/mount/Makefile
View File

@@ -1,29 +1,14 @@
.PHONY: tag push .PHONY: tag push
BASE=alpine:3.5
IMAGE=mount
default: push default: push
hash: Dockerfile mount.sh IMAGE=mount
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) DEPS=Dockerfile mount.sh
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/ .*//' > $@
push: hash HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
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
tag: hash tag: $(DEPS)
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker build --squash --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) .
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash
clean: push: tag
rm -f hash docker pull linuxkit/$(IMAGE):$(HASH) || \
docker push linuxkit/$(IMAGE):$(HASH)
.DELETE_ON_ERROR: