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

pkg: Convert openntpd to use the Alpine base image 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:56:50 +01:00
parent 41a1d16694
commit 17adcefe6c
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/openntpd/Dockerfile
View File

@ -1,10 +1,12 @@
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/
openntpd \ COPY --from=mirror /mirror /mirror/
&& true
RUN apk add --no-cache openntpd && true
RUN rm -rf /mirror /etc/apk/repositories /etc/apk/keys
COPY . . COPY . .

31
pkg/openntpd/Makefile
View File

@ -1,29 +1,14 @@
.PHONY: tag push clean container .PHONY: tag push
default: push default: push
IMAGE=openntpd IMAGE=openntpd
DEPS=Dockerfile etc/ntpd.conf
BASE=alpine:3.5 HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
hash: Dockerfile etc/ntpd.conf tag: $(DEPS)
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) docker build --squash --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) .
tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --rm $(IMAGE):build sh -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash
push: hash push: tag
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker pull linuxkit/$(IMAGE):$(HASH) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ docker push linuxkit/$(IMAGE):$(HASH)
docker push linuxkit/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
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
clean:
rm -rf hash
.DELETE_ON_ERROR: