Build test container from a Docker container

Corresponds to #1030 but for test container

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

alpine/test/.gitignore

@@ -1,4 +1,2 @@
-ca-certificates.crt
-mksh
 rootfs
 config.json

alpine/test/Dockerfile

@@ -1,13 +0,0 @@
-FROM alpine:3.5
-
-COPY test.sh mksh /tmp/bin/
-COPY ca-certificates.crt /tmp/etc/ssl/certs/ca-certificates.crt
-COPY moby /tmp/etc/
-
-WORKDIR /tmp
-
-RUN printf 'FROM scratch\nCOPY . ./\nENTRYPOINT ["/bin/sh", "-c"]\nCMD ["/bin/test.sh"]' > Dockerfile
-
-RUN mv bin/mksh bin/sh
-
-CMD ["tar", "cf", "-", "."]

alpine/test/Makefile

@@ -1,38 +1,20 @@
-# Tag 48a34c44de78a7607b8b03e54efffc8ede461342
-MKSH_IMAGE=mobylinux/mksh@sha256:b9ca6f8ec3d7855db91162555128429030e0ebc950881c1f09015c40d9e875d2
-MKSH_FILE=mksh
-MKSH_PATH=/bin
-
-# Tag: 41e4b91c9a619e46f76ce2d024067c09b62f07b4
-CACERT_IMAGE=mobylinux/ca-certificates@sha256:6ca2dca9cfb8534a55f3a17f8797943527db5bbac08c98a5c9a4836250f4c548
-CACERT_FILE=ca-certificates.crt
-CACERT_PATH=/etc/ssl/certs
+# Tag: 6479aea36e0c3d177297cc936db5cbf93ece467c
+TEST_IMAGE=mobylinux/test@sha256:5425a613bfbb9563d122c21a4a5377cc4cf836a5b201accfecf596a13c8dc607
 
 default: config.json
 
-BASE=alpine:3.5
+EXCLUDE=--exclude .dockerenv --exclude Dockerfile \
+	--exclude dev/console --exclude dev/pts --exclude dev/shm \
+	--exclude etc/hostname --exclude etc/hosts --exclude etc/mtab --exclude etc/resolv.conf
 
-$(MKSH_FILE):
-	docker run --rm --net=none $(MKSH_IMAGE) tar cf - -C $(MKSH_PATH) $(MKSH_FILE) | tar xf -
-
-$(CACERT_FILE):
-	docker run --rm --net=none $(CACERT_IMAGE) tar cf - -C $(CACERT_PATH) $(CACERT_FILE) | tar xf -
-
-config.json: Dockerfile test.sh moby $(MKSH_FILE) $(CACERT_FILE)
+config.json:
 	mkdir -p rootfs
-	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
-	BUILD=$$( tar cf - $^ | docker build -q - ) && \
-	[ -n "$$BUILD" ] && \
-	echo "Built $$BUILD" && \
-	IMAGE=$$( docker run --rm --net=none $$BUILD | docker build -q - ) && \
-	[ -n "$$IMAGE" ] && \
-	echo "Built $$IMAGE" && \
-	CONTAINER=$$( docker create $$IMAGE /dev/null ) && \
+	CONTAINER=$$( docker create $(TEST_IMAGE) /dev/null ) && \
 	docker export $$CONTAINER | tar -xf - -C rootfs $(EXCLUDE) && \
 	docker rm $$CONTAINER && \
-	../containers/riddler.sh --cap-drop all --cap-add SYS_ADMIN -e HOME=/tmp -u 0:0 -v /var/tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock:ro -v /usr/bin/docker:/usr/bin/docker:ro -v /etc/resolv.conf:/etc/resolv.conf:ro --net host --read-only $$IMAGE /bin/test.sh >$@
+	../containers/riddler.sh --cap-drop all --cap-add SYS_ADMIN -e HOME=/tmp -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock:ro -v /usr/bin/docker:/usr/bin/docker:ro -v /etc/resolv.conf:/etc/resolv.conf:ro --net host --read-only $(TEST_IMAGE) /bin/sh /bin/test.sh >$@
 
 clean:
-	rm -rf rootfs config.json $(MKSH_FILE) $(CACERT_FILE)
+	rm -rf rootfs config.json
 
 .DELETE_ON_ERROR:

alpine/test/moby

@@ -1,10 +0,0 @@
-
-                        ##         .
-                  ## ## ##        ==
-               ## ## ## ## ##    ===
-           /"""""""""""""""""\___/ ===
-      ~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ /  ===- ~~~
-           \______ o           __/
-             \    \         __/
-              \____\_______/
-

alpine/test/test.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-docker version
-docker info
-docker ps
-DOCKER_CONTENT_TRUST=1 docker pull alpine
-docker run --rm alpine true
-docker pull armhf/alpine
-docker run --rm armhf/alpine uname -a
-docker swarm init
-docker run mobylinux/check-config@sha256:4282f589d5a72004c3991c0412e45ba0ab6bb8c0c7d97dc40dabc828700e99ab
-docker run mobylinux/check-kernel-config@sha256:6821a7bce30bd013a6cc190d171228f9b02359e9c792858005f401ab15357575
-cat /etc/moby