github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-04 01:21:46 +00:00
Code Issues Projects Releases Wiki Activity

tools/mkimage-iso-*: Transition to alpine base + package.mk

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-07-26 14:08:54 +01:00
parent 9f7917e543
commit df19ad752a
4 changed files with 6 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mkimage-iso-bios/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.5
FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908
RUN \
apk update && apk upgrade && \

29
tools/mkimage-iso-bios/Makefile
View File

@@ -1,29 +1,4 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=mkimage-iso-bios
DEPS=make-iso
default: push
hash: Dockerfile make-iso
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/ .*//' > $@
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
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 -f hash
.DELETE_ON_ERROR:
include ../../pkg/package.mk

2
tools/mkimage-iso-efi/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:edge
FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908
RUN \
apk update && apk upgrade && \

29
tools/mkimage-iso-efi/Makefile
View File

@@ -1,29 +1,4 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=mkimage-iso-efi
DEPS=make-efi
default: push
hash: Dockerfile make-efi
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/ .*//' > $@
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
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 -f hash
.DELETE_ON_ERROR:
include ../../pkg/package.mk