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

tests: Convert docker-bench to use multi-stage builds

Browse Source 
Also update to docker 17.05.0-ce and only install
the docker CLI, not the rest.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-29 19:34:56 +01:00
parent 5bb90f166a
commit d9c2c366e4
2 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,31 @@
FROM alpine:3.5 FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa AS mirror
RUN apk update && apk upgrade && apk add --no-cache bash curl RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
ADD . ./ 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_BUCKET get.docker.com
ENV DOCKER_VERSION 17.04.0-ce ENV DOCKER_VERSION 17.05.0-ce
ENV DOCKER_SHA256 c52cff62c4368a978b52e3d03819054d87bcd00d15514934ce2e0e09b99dd100 ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9
# Downloads docker but only installs the client # Install just the client
RUN set -x \ 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 - \ && echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
&& tar -xzvf docker.tgz \ && tar -xzvf docker.tgz \
&& mv docker/docker /usr/bin/ \ && mv docker/docker /usr/bin/ \
&& rm -rf docker \ && rm -rf docker \
&& rm docker.tgz \ && rm docker.tgz \
&& docker -v && docker -v
COPY . ./ COPY bench_runner.sh ./bench_runner.sh
ENTRYPOINT ["/bin/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 .PHONY: tag push
BASE=alpine:3.5
IMAGE=test-docker-bench
default: push default: push
hash: Dockerfile bench_runner.sh ORG?=linuxkit
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) IMAGE=test-docker-bench
tar cf - $^ | docker build --no-cache -t $(IMAGE):build - DEPS=Dockerfile Makefile bench_runner.sh
docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash
push: hash HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
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
tag: hash tag: $(DEPS)
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker build --squash --no-cache -t $(ORG)/$(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_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
.DELETE_ON_ERROR: