diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b791e0a..46effcc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,8 +66,8 @@ prod_aihit_build: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" script: - - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr wl 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 -f PARR.Worker/Dockerfile . + - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d as) + - 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=$IMAGE_VERSION -f 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 +83,7 @@ prod_aihit_deploy: except: - branches script: - - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr as v) + - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d as) - tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d parallel: matrix: