From 791e11f07a74ccd7a1750838693eaff34dc59687 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 28 Apr 2017 14:41:23 +0100 Subject: [PATCH 1/2] Pull images on CI Always do `moby build --pull` on CI. Signed-off-by: Justin Cormack --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d38ac68e2..d6a26dff2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ bin/linuxkit: $(LINUXKIT_DEPS) | bin touch $@ test-initrd.img: $(MOBY) test/test.yml - $(MOBY) build test/test.yml + $(MOBY) build --pull test/test.yml test-bzImage: test-initrd.img @@ -68,7 +68,7 @@ test: $(LINUXKIT) test-initrd.img test-bzImage test-cmdline $(call check_test_log, test.log) test-ltp.img.tar.gz: $(MOBY) test/ltp/test-ltp.yml - $(MOBY) build test/ltp/test-ltp.yml + $(MOBY) build --pull test/ltp/test-ltp.yml .PHONY: test-ltp test-ltp: $(LINUXKIT) test-ltp.img.tar.gz From 10ad06603149723106f69d6d293f0e740e9dd376 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 28 Apr 2017 14:55:25 +0100 Subject: [PATCH 2/2] Pin moby tool commit Signed-off-by: Justin Cormack --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d6a26dff2..5d6b0e74d 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,9 @@ endif PREFIX?=/usr/local/ +MOBY_COMMIT=3375f32d51dcf1a043b79a4d6f4a9cc696a8b19e bin/moby: | bin - docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar + docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar tar xf tmp_moby_bin.tar > $@ rm tmp_moby_bin.tar touch $@