From bae8699fd958834c2155bc8ed33f1b9d53d7b0a6 Mon Sep 17 00:00:00 2001
From: Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Fri, 2 Jun 2023 01:51:40 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c64fc98..38cee18e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,8 +66,9 @@ prod_aihit_build:
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
   script:
-    - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d as)
-    - docker build -t $REPO/$PROD_NAME_AIHIT:$CI_COMMIT_TAG -t $REPO/$PROD_NAME_AIHIT:latest -t $PROD_NAME_AIHIT:$CI_COMMIT_TAG -t $PROD_NAME_AIHIT:latest --build-arg app_version=$IMAGE_VERSION -f PARR.Worker/PARR.Worker/Dockerfile .
+    - APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d as)
+    - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr as v)
+    - docker build -t $REPO/$PROD_NAME_AIHIT:$IMAGE_VERSION -t $REPO/$PROD_NAME_AIHIT:latest -t $PROD_NAME_AIHIT:$IMAGE_VERSION -t $PROD_NAME_AIHIT:latest --build-arg app_version=$APP_VERSION -f PARR.Worker/PARR.Worker/Dockerfile .
     - docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
     - docker push --all-tags $REPO/$PROD_NAME_AIHIT
   tags:
@@ -83,7 +84,8 @@ prod_aihit_deploy:
   except:
     - branches
   script:
-    - tag=$CI_COMMIT_TAG docker compose -f docker-compose.aihit-syncher.yml up -d
+    - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr as v)
+    - tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d
   parallel:
     matrix:
       - RUNNER: shell-as-1