diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46effcc7..e328c17a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,11 +67,11 @@ prod_aihit_build: DOCKER_TLS_CERTDIR: "" script: - 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 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/Dockerfile . - docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO - docker push --all-tags $REPO/$PROD_NAME_AIHIT tags: - - docker + - docker-as prod_aihit_deploy: @@ -83,8 +83,7 @@ prod_aihit_deploy: except: - branches script: - - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d as) - - tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d + - tag=$CI_COMMIT_TAG docker compose -f docker-compose.aihit-syncher.yml up -d parallel: matrix: - RUNNER: shell-as-1