Merge pull request #1010 from justincormack/test-tidy

Tidy up test build

alpine/test/Dockerfile

@@ -1,9 +1,8 @@
-# Will do a Go build in future
-# Tag: 2c9434f1c4ff70b102f34a97d2df1a8363a11a65
-FROM mobylinux/alpine-build-go@sha256:d528bbf7102e4209bd59ef030d41de9003ab8e42c303956f62b2df47f3e17849
+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
 

alpine/test/Makefile

@@ -10,14 +10,17 @@ CACERT_PATH=/etc/ssl/certs
 
 default: config.json
 
+BASE=alpine:3.5
+
 $(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 $(MKSH_FILE) $(CACERT_FILE)
+config.json: Dockerfile test.sh moby $(MKSH_FILE) $(CACERT_FILE)
 	mkdir -p rootfs
+	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
 	BUILD=$$( tar cf - $^ | docker build -q - ) && \
 	[ -n "$$BUILD" ] && \
 	echo "Built $$BUILD" && \

alpine/test/moby

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

alpine/test/test.sh

@@ -12,3 +12,4 @@ docker run --rm armhf/alpine uname -a
 docker swarm init
 docker run mobylinux/check-config@sha256:4282f589d5a72004c3991c0412e45ba0ab6bb8c0c7d97dc40dabc828700e99ab
 docker run mobylinux/check-kernel-config@sha256:8c48a0f8456e1e5027eb2540974e6304d8cf58263c7553b61838cb627c4e790c
+cat /etc/moby