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

pkg: Roll the swap package from linuxkit/alpine

Browse Source 
Also convert to a multi-stage build and make the
make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-18 15:27:39 +01:00
parent add7b63276
commit 9f6578783b
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/swap/Dockerfile
View File

@ -1,13 +1,17 @@
FROM alpine:3.5 FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \
busybox \
cryptsetup \
musl \
util-linux
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
# swap command - only minimal Alpine install FROM scratch
ENTRYPOINT []
# use util-linux to get swapfile utils, cryptsetup CMD []
# at some point, hopefully use our own mkswap and swapon, as well as cryptsetup WORKDIR /
RUN apk add --update util-linux cryptsetup COPY --from=mirror /out/ /
COPY /swap.sh .
# add the entrypoint and make it executable ENTRYPOINT ["swap.sh"]
COPY . ./
# ENTRYPOINT
ENTRYPOINT swap.sh

35
pkg/swap/Makefile
View File

@ -1,30 +1,15 @@
# copy from mount .PHONY: tag push
.PHONY: tag push clean
BASE=alpine:3.5
IMAGE=linuxkit/swap
default: push default: push
hash: Dockerfile swap.sh ORG?=linuxkit
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) IMAGE=swap
tar cf - $^ | docker build --no-cache -t $(IMAGE):build - DEPS=Dockerfile swap.sh
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 $(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build $(IMAGE):$(shell cat hash) && \
docker push $(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash tag: $(DEPS)
docker pull $(IMAGE):$(shell cat hash) || \ docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
docker tag $(IMAGE):build $(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash
clean: push: tag
rm -f hash docker pull $(ORG)/$(IMAGE):$(HASH) || \
docker push $(ORG)/$(IMAGE):$(HASH)
.DELETE_ON_ERROR: