From d8bbbb2cb493b2ab658a7941bcc57546ef4939b5 Mon Sep 17 00:00:00 2001
From: Casey Kuhlman <casey@erisindustries.com>
Date: Tue, 11 Oct 2016 14:22:27 +0200
Subject: [PATCH] fixup docker build
---
circle.yml | 2 ++
tests/build_tool.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/circle.yml b/circle.yml
index f6a1eda5..bf00b353 100644
--- a/circle.yml
+++ b/circle.yml
@@ -42,6 +42,7 @@ deployment:
commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
- tests/build_tool.sh
+ - "docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
- docker push quay.io/eris/db
- docs/build.sh master
develop:
@@ -49,5 +50,6 @@ deployment:
commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
- tests/build_tool.sh
+ - "docker rmi quay.io/eris/db:latest && docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build"
- docker push quay.io/eris/db
- docs/build.sh
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index 2d1d9384..523de1a4 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -41,7 +41,7 @@ docker run --rm --entrypoint cat $IMAGE:build /usr/local/bin/eris-client > $REPO
docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
# Cleanup
-rm $REPO/$TARGET
+rm $REPO/"$TARGET"_build_artifact
rm $REPO/eris-client
# Extra Tags
--
GitLab