From aa5d2faaeb6206e71faae90484c72c8b10123900 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <aferrand@ecomundo.eu>
Date: Sun, 16 Sep 2018 22:10:35 +0200
Subject: [PATCH] Correct config

---
 .circleci/config.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c92ec6..e848c83 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,3 @@
-# Configure CircleCI
 version: 2
 jobs:
   build:
@@ -21,16 +20,14 @@ jobs:
     steps:
       - attach_workspace:
           at: /tmp/workspace
-      - run:
-          command:
-            echo 'if [ ${CIRCLE_BRANCH} = master ]; then DOCKER_TAG=latest else DOCKER_TAG=${CIRCLE_TAG:-${CIRCLE_BRANCH}} fi; export DOCKER_TAG' >> $BASH_ENV
       - run:
           command:
             docker load < /tmp/workspace/docker-backuppc.tar
       - deploy: 
           command: |
-            DOCKER_TAG=${CIRCLE_TAG:-${CIRCLE_BRANCH}}
-            echo ${DOCKER_TAG}
+            if [ ${CIRCLE_BRANCH} = master ]; then DOCKER_TAG=latest; else DOCKER_TAG=${CIRCLE_TAG:-${CIRCLE_BRANCH}}; fi
+            docker tag adferrand/backuppc adferrand/backuppc:${DOCKER_TAG}
+            docker push adferrand/backuppc:${DOCKER_TAG}
 workflows:
   version: 2
   build-n-deploy: