From e8abf31e94b7c0b0e9d0a11acc2b79217b978228 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 19 Feb 2015 14:16:26 -0700 Subject: [PATCH] Check that docker wait exits with 0 --- cmd/{control/cloud-config.go => cloudinit/cloudinit.go} | 0 scripts/ci | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename cmd/{control/cloud-config.go => cloudinit/cloudinit.go} (100%) diff --git a/cmd/control/cloud-config.go b/cmd/cloudinit/cloudinit.go similarity index 100% rename from cmd/control/cloud-config.go rename to cmd/cloudinit/cloudinit.go diff --git a/scripts/ci b/scripts/ci index bc78793e..92af3a93 100755 --- a/scripts/ci +++ b/scripts/ci @@ -25,7 +25,7 @@ generate_images() CID=$(docker run -d --privileged ${DOCKER_IMAGE} /source/scripts/build-images) docker logs -f ${CID} & trap "docker rm -f ${CID}" exit - docker wait $CID + [ "$(docker wait $CID)" == 0 ] DOCKER_BASE=$(docker commit $CID) echo ${DOCKER_BASE} > ${BUILD}/${IMAGE_ID}