From 50b4181866d5a50be393bc86fa287c0a33b2c9e6 Mon Sep 17 00:00:00 2001
From: Bradley Cicenas <bradley@vektor.nyc>
Date: Wed, 15 Mar 2017 09:16:04 +1000
Subject: [PATCH] update circle config

---
 circle.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/circle.yml b/circle.yml
index 1d1f301..0f2dbbd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,27 +2,22 @@ machine:
   services:
     - docker
   environment:
-    VERSION: $(cat VERSION)
     IMAGE_NAME: quay.io/vektorlab/ctop
 
 dependencies:
   override:
     - docker info
-    - |
-      if [[ "$CIRCLE_BRANCH" == "master" ]]; then
-        docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:latest .
-      else
-        docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:${CIRCLE_BRANCH} .
-      fi
+    - docker build --build-arg CTOP_VERSION=$(cat VERSION) -t ctop .
 
 test:
   override:
-    - docker run -t --entrypoint /bin/sh quay.io/vektorlab/ctop:latest -v
+    - docker run -ti ctop -v
 
 deployment:
   hub:
     branch: master
     commands:
-      - docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:${VERSION}
+      - docker tag ctop ${IMAGE_NAME}:latest
+      - docker tag ctop ${IMAGE_NAME}:$(cat VERSION)
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - docker push ${IMAGE_NAME}