Merge pull request #2298 from ijc/tools-and-test-iidfile

tools & test use package.mk and build --iidfile
2025-12-25 10:02:31 +00:00 · 2017-07-27 10:24:46 +01:00
parent 941e31a519 5217b9973b
commit 79d3546dfd
312 changed files with 621 additions and 827 deletions
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
 # util-linux is required for btrfs test (losetup)
--- a/test/pkg/containerd/Makefile
+++ b/test/pkg/containerd/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-containerd
-DEPS=Dockerfile Makefile run.sh
+DEPS=run.sh
+NETWORK=1

-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk
--- a/test/pkg/docker-bench/Dockerfile
+++ b/test/pkg/docker-bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 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 \
--- a/test/pkg/docker-bench/Makefile
+++ b/test/pkg/docker-bench/Makefile
@@ -1,15 +1,6 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-docker-bench
-DEPS=Dockerfile Makefile bench_runner.sh
+DEPS=bench_runner.sh
+NETWORK=1

-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk

-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
--- a/test/pkg/kernel-config/Dockerfile
+++ b/test/pkg/kernel-config/Dockerfile
@@ -1,6 +1,13 @@
-FROM alpine:3.5
-RUN apk update && apk upgrade && apk add --no-cache bash
-ADD https://raw.githubusercontent.com/docker/docker/master/contrib/check-config.sh /check-config.sh
-ADD . ./
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 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 bash
+
+ENV DOCKER_CHECK_CONFIG_COMMIT=72cda6a6c2f25854bea2d69168082684f2c9feca
+ADD https://raw.githubusercontent.com/docker/docker/${DOCKER_CHECK_CONFIG_COMMIT}/contrib/check-config.sh /out/check-config.sh
+ADD . ./out
+
+FROM scratch
+COPY --from=mirror /out /
 ENTRYPOINT ["/bin/sh", "/check.sh"]
 LABEL org.mobyproject.config='{"readonly": true, "binds": ["/lib/modules:/lib/modules", "/dev:/dev", "/sys:/sys"], "capabilities": ["all"]}'
--- a/test/pkg/kernel-config/Makefile
+++ b/test/pkg/kernel-config/Makefile
@@ -1,29 +1,5 @@
-.PHONY: tag push
-
-BASE=alpine:3.5
 IMAGE=test-kernel-config
+DEPS=$(wildcard *.sh)
+NETWORK=1

-default: push
-
-hash: Dockerfile check.sh check-kernel-config.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
-
-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
-
-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
--- a/test/pkg/ltp/Makefile
+++ b/test/pkg/ltp/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-ltp
-DEPS=Dockerfile Makefile check.sh
+DEPS=check.sh
+NETWORK=1

-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk
--- a/test/pkg/ns/Makefile
+++ b/test/pkg/ns/Makefile
@@ -1,5 +1,5 @@
 IMAGE=test-ns
 NETWORK=1
-DEPS=Dockerfile Makefile
+DEPS=config.template.json $(wildcard *.sh)

 include ../../../pkg/package.mk
--- a/test/pkg/ns/template.yml
+++ b/test/pkg/ns/template.yml
@@ -14,7 +14,7 @@ onboot:
    - type: cgroup
      options: ["rw"]
  - name: poweroff
-    image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
+    image: linuxkit/poweroff:3845c4d64d47a1ea367806be5547e44594b0fa91
    command: ["/bin/sh", "/poweroff.sh", "3"]
 trust:
  org:
--- a/test/pkg/poweroff/Dockerfile
+++ b/test/pkg/poweroff/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 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
--- a/test/pkg/poweroff/Makefile
+++ b/test/pkg/poweroff/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=poweroff
-DEPS=Dockerfile Makefile poweroff.sh
+DEPS=poweroff.sh

-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk

-tag: $(DEPS)
-	docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
--- a/test/pkg/virtsock/Dockerfile
+++ b/test/pkg/virtsock/Dockerfile
@@ -1,10 +1,10 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
    tini
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache

-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS build
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS build

 RUN apk add --no-cache go musl-dev git make
 ENV GOPATH=/go PATH=$PATH:/go/bin
--- a/test/pkg/virtsock/Makefile
+++ b/test/pkg/virtsock/Makefile
@@ -1,15 +1,6 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-virtsock
-DEPS=Dockerfile Makefile
+DEPS=
+NETWORK=1

-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk

-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)