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

Merge pull request #1937 from rneugeba/mstage

Browse Source 
Convert remaining packages to multi-stage, git tree hash, and Alpine base
This commit is contained in:
Rolf Neugebauer 2017-05-30 17:52:18 +01:00 committed by GitHub
commit 9e39a8f642
35 changed files with 147 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ all: default
VERSION="0.0" # dummy for now
GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:3ba94f14de51b73551417e769d122815ec917ee7
GO_COMPILE=linuxkit/go-compile:6579a00b44686d0e504d513fc4860094769fe7df
MOBY?=bin/moby
LINUXKIT?=bin/linuxkit

4
docs/vendoring.md
View File

@ -22,7 +22,7 @@ docker run -it --rm \
-v $(PWD):/go/src/github.com/docker/moby \
-w /go/src/github.com/docker/moby \
--entrypoint /go/bin/vndr \
linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8
linuxkit/go-compile:6579a00b44686d0e504d513fc4860094769fe7df
```
To update a single dependency:
@ -32,7 +32,7 @@ docker run -it --rm \
-v $(PWD):/go/src/github.com/docker/moby \
-w /go/src/github.com/docker/moby \
--entrypoint /go/bin/vndr \
linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8 \
linuxkit/go-compile:6579a00b44686d0e504d513fc4860094769fe7df \
github.com/docker/docker
```

2
src/cmd/linuxkit/run_qemu.go
View File

@ -15,7 +15,7 @@ import (
)
// QemuImg is the version of qemu container
const QemuImg = "linuxkit/qemu:17f052263d63c8a2b641ad91c589edcbb8a18c82"
const QemuImg = "linuxkit/qemu:c9691f5c50dd191e62b77eaa2f3dfd05ed2ed77c"
// QemuConfig contains the config for Qemu
type QemuConfig struct {

2
test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
trust:
org:

2
test/cases/010_platforms/000_qemu/010_run_iso/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
trust:
org:

2
test/cases/010_platforms/000_qemu/020_run_efi/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
trust:
org:

2
test/cases/010_platforms/000_qemu/030_run_qcow/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
trust:
org:

2
test/cases/010_platforms/000_qemu/100_container/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
org:

2
test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
trust:
org:

2
test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
View File

@ -10,7 +10,7 @@ onboot:
image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"
readonly: true
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
org:

2
test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
View File

@ -10,7 +10,7 @@ onboot:
image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"
readonly: true
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
org:

2
test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml
View File

@ -10,7 +10,7 @@ onboot:
image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"
readonly: true
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
org:

2
test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
View File

@ -14,7 +14,7 @@ onboot:
capabilities:
- all
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
org:

2
test/cases/030_security/000_docker-bench/test-docker-bench.yml
View File

@ -36,7 +36,7 @@ services:
- /lib/modules:/lib/modules
- /run:/var/run
- name: test-docker-bench
image: "linuxkit/test-docker-bench:2f941429d874c5dcf05e38005affb4f10192e1a8"
image: "linuxkit/test-docker-bench:5264fdfd098d2bfbacd88159e92bc59a9d2be6cc"
ipc: host
pid: host
net: host

2
test/cases/040_packages/002_binfmt/test-binfmt.yml
View File

@ -16,7 +16,7 @@ onboot:
- /proc/sys/fs/binfmt_misc:/binfmt_misc
command: ["sh", "./check.sh"]
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
files:
- path: check.sh

2
test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
View File

@ -15,7 +15,7 @@ onboot:
- /etc:/host-etc
command: ["sh", "./check.sh"]
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
files:
- path: check.sh

2
test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
View File

@ -17,7 +17,7 @@ onboot:
- /check.sh:/check.sh
command: ["sh", "./check.sh"]
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
files:
- path: check.sh

2
test/cases/040_packages/013_mkimage/mkimage.yml
View File

@ -9,7 +9,7 @@ onboot:
- name: mkimage
image: "linuxkit/mkimage:a3fd615543b84733ac8ba6f7e1927727665ef404"
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
files:
- path: data/kernel
source: run-kernel

2
test/cases/040_packages/013_mkimage/run.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
trust:
org:
- linuxkit

2
test/cases/040_packages/019_sysctl/test-sysctl.yml
View File

@ -18,7 +18,7 @@ onboot:
- /check.sh:/check.sh
command: ["sh", "./check.sh"]
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "10"]
files:
- path: check.sh

8
test/hack/test-ltp.yml
View File

@ -7,15 +7,11 @@ init:
- linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b
onboot:
- name: ltp
image: "linuxkit/test-ltp:20170116"
net: host
pid: host
image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d"
binds:
- /etc/ltp/baseline:/etc/ltp/baseline
capabilities:
- all
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
files:
- path: /etc/ltp/baseline
contents: "100"

2
test/hack/test.yml
View File

@ -15,7 +15,7 @@ onboot:
image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"
readonly: true
- name: poweroff
image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8"
image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
command: ["/bin/sh", "/poweroff.sh", "3"]
trust:
image:

27
test/pkg/docker-bench/Dockerfile
View File

@ -1,15 +1,24 @@
FROM alpine:3.5
RUN apk update && apk upgrade && apk add --no-cache bash curl
ADD . ./
FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa 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 \
bash \
curl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
# Also add docker
FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
# Add docker
ENV DOCKER_BUCKET get.docker.com
ENV DOCKER_VERSION 17.04.0-ce
ENV DOCKER_SHA256 c52cff62c4368a978b52e3d03819054d87bcd00d15514934ce2e0e09b99dd100
ENV DOCKER_VERSION 17.05.0-ce
ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9
# Downloads docker but only installs the client
# Install just the client
RUN set -x \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/$(uname -s)/$(uname -m)/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
&& tar -xzvf docker.tgz \
&& mv docker/docker /usr/bin/ \
@ -17,6 +26,6 @@ RUN set -x \
&& rm docker.tgz \
&& docker -v
COPY . ./
COPY bench_runner.sh ./bench_runner.sh
ENTRYPOINT ["/bin/sh", "/bench_runner.sh"]

32
test/pkg/docker-bench/Makefile
View File

@ -1,29 +1,15 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=test-docker-bench
default: push
hash: Dockerfile bench_runner.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/ .*//' > hash
ORG?=linuxkit
IMAGE=test-docker-bench
DEPS=Dockerfile Makefile bench_runner.sh
push: hash
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
DOCKER_CONTENT_TRUST=1 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 -t $(ORG)/$(IMAGE):$(HASH) .
clean:
rm -f hash
.DELETE_ON_ERROR:
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

12
test/pkg/ltp/Dockerfile.build → test/pkg/ltp/Dockerfile
View File

@ -1,7 +1,6 @@
FROM debian:jessie
ARG LTP_VERSION
FROM debian:jessie@sha256:476959f29a17423a24a17716e058352ff6fbf13d8389e4a561c8ccc758245937 AS build
ENV LTP_VERSION=20170116
ENV LTP_SOURCE=https://github.com/linux-test-project/ltp/releases/download/${LTP_VERSION}/ltp-full-${LTP_VERSION}.tar.xz
ENV DEBIAN_FRONTEND=noninteractive
@ -17,3 +16,10 @@ RUN cd /ltp \
&& ./configure \
&& make -j "$(getconf _NPROCESSORS_ONLN)" all \
&& make install
FROM debian:jessie-slim@sha256:12d31a3d5a1f7cb272708be35031ba068dec46fa84af6aeb38aef5c8a83e8974
COPY --from=build /opt/ltp/ /opt/ltp/
ADD check.sh ./check.sh
WORKDIR /opt/ltp
ENTRYPOINT ["/bin/sh", "/check.sh"]
LABEL org.mobyproject.config='{"pid": "host", "capabilities": ["all"]}'

4
test/pkg/ltp/Dockerfile.pkg
View File

@ -1,4 +0,0 @@
FROM debian:jessie-slim@sha256:fb22c1cef74071a6cd0145c1f91ca85ba9bd3f8b4d6db8560fe69eb36a175ca3
ADD . /
WORKDIR /opt/ltp
ENTRYPOINT ["/bin/sh", "/check.sh"]

49
test/pkg/ltp/Makefile
View File

@ -1,44 +1,15 @@
LTP_VERSION=20170116
.PHONY: tag push
default: push
all: ltp.tar push
# Build LTP and get the result as a tarball
DEPS=Dockerfile.build Makefile
ltp.tag: $(DEPS)
BUILD=$$(docker build -f $< -q . --build-arg LTP_VERSION=$(LTP_VERSION)) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && echo "$$BUILD" > $@
ltp.tar: ltp.tag
docker run --rm --net=none --log-driver=none $(shell cat ltp.tag) tar cf - opt/ltp > $@
SHASUM=alpine:3.5
ORG?=linuxkit
IMAGE=test-ltp
DEPS=Dockerfile Makefile check.sh
# Note: We do not compute the hash from all the dependencies here
# because the ltp binaries will change everytime we build. Ideally, we
# would calculate the hash from the source and the apt-get cache, but
# it's not that critical.
hash: Dockerfile.pkg ltp.tar check.sh $(DEPS)
tar xf ltp.tar
tar cf - Dockerfile.pkg opt check.sh | docker build --no-cache -t $(IMAGE):build -f Dockerfile.pkg -
cat Dockerfile.pkg check.sh $(DEPS) | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
push: hash
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(LTP_VERSION) && \
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash) && \
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(LTP_VERSION))
docker rmi $(IMAGE):build
rm -f hash
tag: $(DEPS)
docker build --no-cache -t $(ORG)/$(IMAGE):$(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
.PHONY: clean
clean:
rm -rf opt ltp.tar ltp.tag hash
.DELETE_ON_ERROR:
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

12
test/pkg/poweroff/Dockerfile
View File

@ -1,4 +1,12 @@
FROM alpine:3.5
ADD . ./
FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa 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 musl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
FROM scratch
CMD []
WORKDIR /
COPY --from=mirror /out/ /
COPY /poweroff.sh /poweroff.sh
ENTRYPOINT ["/bin/sh", "/poweroff.sh"]
LABEL org.mobyproject.config='{"pid": "host", "readonly": true, "capabilities": ["CAP_SYS_BOOT"]}'

32
test/pkg/poweroff/Makefile
View File

@ -1,29 +1,15 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=poweroff
default: push
hash: Dockerfile poweroff.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/ .*//' > hash
ORG?=linuxkit
IMAGE=poweroff
DEPS=Dockerfile Makefile poweroff.sh
push: hash
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
DOCKER_CONTENT_TRUST=1 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 --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
clean:
rm -f hash
.DELETE_ON_ERROR:
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

4
tools/alpine/Dockerfile
View File

@ -24,6 +24,9 @@ RUN apk index --rewrite-arch $(uname -m) -o /mirror/$(uname -m)/APKINDEX.unsigne
RUN cp /mirror/$(uname -m)/APKINDEX.unsigned.tar.gz /mirror/$(uname -m)/APKINDEX.tar.gz
RUN abuild-sign /mirror/$(uname -m)/APKINDEX.tar.gz
# fetch OVMF for qemu EFI boot (this is not added as a package)
RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/community ovmf
# set this as our repo
RUN echo "/mirror" > /etc/apk/repositories && apk update
@ -44,6 +47,7 @@ COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
COPY --from=mirror /etc/apk/keys /etc/apk/keys/
COPY --from=mirror /mirror /mirror/
COPY --from=mirror /go/bin /go/bin/
COPY --from=mirror /usr/share/ovmf/bios.bin /usr/share/ovmf/bios.bin
COPY --from=mirror /Dockerfile /Dockerfile
COPY --from=shellcheck /usr/local/bin/shellcheck /usr/local/bin/shellcheck

22
tools/go-compile/Dockerfile
View File

@ -1,10 +1,16 @@
FROM alpine:3.5
RUN apk update && apk add --no-cache build-base git go
FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa 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 \
git \
go \
musl-dev
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
FROM scratch
ENV GOPATH=/go PATH=$PATH:/go/bin
RUN go get -u github.com/golang/lint/golint && \
go get -u github.com/gordonklaus/ineffassign && \
go get -u github.com/LK4D4/vndr
COPY . ./
COPY --from=mirror /out/ /
COPY --from=mirror /go/bin/ /go/bin/
COPY /compile.sh /compile.sh
ENTRYPOINT ["/compile.sh"]

44
tools/go-compile/Makefile
View File

@ -1,41 +1,15 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=go-compile
default: push
hash: Dockerfile compile.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 /go/bin/golint | sha1sum" | sed 's/ .*//' > hash
ORG?=linuxkit
IMAGE=go-compile
DEPS=Dockerfile Makefile compile.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 --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
signed-tag: hash
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
docker build --no-cache -t $(IMAGE):build . && \
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
sign: signed-tag
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)
rm -f hash
docker rmi $(IMAGE):build || true
clean:
rm -f hash
.DELETE_ON_ERROR:
push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

28
tools/qemu/Dockerfile
View File

@ -1,15 +1,19 @@
FROM alpine:edge
COPY repositories /etc/apk/
RUN \
apk update && apk upgrade && \
apk add --no-cache \
FROM linuxkit/alpine:5240cbd9cf371c8211c8f1968e57c51a32098c8f 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 \
libarchive-tools \
qemu-img \
qemu-system-arm \
qemu-system-x86_64 \
ovmf@testing \
&& true
qemu-system-x86_64
RUN mkdir -p /out/usr/share/ovmf \
&& cp /usr/share/ovmf/bios.bin /out/usr/share/ovmf/bios.bin
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
FROM scratch
ENTRYPOINT []
CMD []
WORKDIR /
COPY --from=mirror /out/ /
COPY . .

32
tools/qemu/Makefile
View File

@ -1,29 +1,15 @@
.PHONY: tag push
BASE=alpine:3.5
IMAGE=qemu
default: push
hash: Dockerfile repositories
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 Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
ORG?=linuxkit
IMAGE=qemu
DEPS=Dockerfile Makefile
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_CONTENT_TRUST=1 docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
clean:
rm -f hash
.DELETE_ON_ERROR:
push: tag
docker pull $(ORG)/$(IMAGE):$(HASH) || \
docker push $(ORG)/$(IMAGE):$(HASH)

2
tools/qemu/repositories
View File

@ -1,2 +0,0 @@
http://dl-cdn.alpinelinux.org/alpine/edge/main
@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing