From 0c111299bb4b7633671e64531a80f3496a643d87 Mon Sep 17 00:00:00 2001
From: Casey Kuhlman <casey@erisindustries.com>
Date: Mon, 10 Oct 2016 21:44:40 +0200
Subject: [PATCH] fix circle problems; push correct image
---
circle.yml | 8 ++++----
tests/build_tool.sh | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/circle.yml b/circle.yml
index 181f2149..f6a1eda5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -40,14 +40,14 @@ deployment:
master:
branch: master
commands:
- - tests/build_tool.sh
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
- - docker push quay.io/eris/erisdb
+ - tests/build_tool.sh
+ - docker push quay.io/eris/db
- docs/build.sh master
develop:
branch: develop
commands:
- - tests/build_tool.sh
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
- - docker push quay.io/eris/erisdb
+ - tests/build_tool.sh
+ - docker push quay.io/eris/db
- docs/build.sh
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index b51f4b11..2d1d9384 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -43,10 +43,6 @@ docker build -t $IMAGE:$release_min -f Dockerfile.deploy $REPO
# Cleanup
rm $REPO/$TARGET
rm $REPO/eris-client
-if [ "$CI" ]
-then
- docker rmi $IMAGE:build
-fi
# Extra Tags
if [[ "$branch" = "master" ]]
--
GitLab