Use build container id rather than tagging builds

This means that multiple builds will not conflict, so we can
remove the lock from the CI. Also quieter when no errors.

Some still left to do, only done the ones used in build and CI
initially. Some of the others will be cleaned up anyway later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2016-09-29 20:18:38 +01:00
parent 6fb163c2a5
commit fa19d3259b
11 changed files with 42 additions and 30 deletions

View File

@@ -22,9 +22,10 @@ qemu-iso: Dockerfile.qemuiso alpine/mobylinux-bios.iso
test: Dockerfile.test alpine/initrd.img alpine/kernel/x86_64/vmlinuz64
$(MAKE) -C alpine
tar cf - $^ | docker build -f Dockerfile.test -t mobytest:build -
touch test.log
docker run --rm mobytest:build 2>&1 | tee -a test.log
BUILD=$$( tar cf - $^ | docker build -f Dockerfile.test -q - ) && [ -n "$$BUILD" ] && \
touch test.log && \
docker run --rm $$BUILD 2>&1 | tee -a test.log && \
docker rmi --no-prune $$BUILD
@cat test.log | grep -q 'Moby test suite PASSED'
TAG=$(shell git rev-parse HEAD)