From 86a409a174d84be44bcfbd54994be5837f977c5c Mon Sep 17 00:00:00 2001
From: Andrey Taranik <andrey@cicd.team>
Date: Fri, 5 Nov 2021 18:08:13 +0300
Subject: [PATCH] cleanup circleci config after test

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c2783383b..fc0c8793b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -431,9 +431,9 @@ jobs:
           name: Build and push Docker image
           command: |
             echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-            DOCKER_TAG=${CIRCLE_SHA1:0:7} # or DOCKER_TAG=${CIRCLE_BUILD_NUM} or DOCKER_TAG=$(git log --oneline|wc -l)
-            docker build --build-arg GIT_VERSION=$CIRCLE_SHA1 -t zenithdb/zenith:latest . # && docker push zenithdb/zenith:latest
-            docker tag zenithdb/zenith:latest zenithdb/zenith:${DOCKER_TAG} # && docker push zenithdb/zenith:${DOCKER_TAG}
+            DOCKER_TAG=$(git log --oneline|wc -l)
+            docker build --build-arg GIT_VERSION=$CIRCLE_SHA1 -t zenithdb/zenith:latest . && docker push zenithdb/zenith:latest
+            docker tag zenithdb/zenith:latest zenithdb/zenith:${DOCKER_TAG} && docker push zenithdb/zenith:${DOCKER_TAG}
 
   # Build zenithdb/compute-node:latest image and push it to Docker hub
   docker-image-compute:
@@ -450,9 +450,9 @@ jobs:
           name: Build and push Docker image
           command: |
             echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin
-            DOCKER_TAG=${CIRCLE_SHA1:0:7} # or DOCKER_TAG=${CIRCLE_BUILD_NUM} or DOCKER_TAG=$(git log --oneline|wc -l)
-            docker build -t zenithdb/compute-node:latest vendor/postgres # && docker push zenithdb/compute-node:latest
-            docker tag zenithdb/compute-node:latest zenithdb/compute-node:${DOCKER_TAG} # && docker push zenithdb/compute-node:${DOCKER_TAG}
+            DOCKER_TAG=$(git log --oneline|wc -l)
+            docker build -t zenithdb/compute-node:latest vendor/postgres && docker push zenithdb/compute-node:latest
+            docker tag zenithdb/compute-node:latest zenithdb/compute-node:${DOCKER_TAG} && docker push zenithdb/compute-node:${DOCKER_TAG}
 
   # Trigger a new remote CI job
   remote-ci-trigger:
@@ -554,7 +554,6 @@ workflows:
             branches:
               only:
                 - main
-                - feature/tag-docker-images
           requires:
             - pg_regress-tests-release
             - other-tests-release
@@ -566,7 +565,6 @@ workflows:
             branches:
               only:
                 - main
-                - feature/tag-docker-images
           requires:
             - pg_regress-tests-release
             - other-tests-release