From 9f42a733e7d98f3c69fefa09e3aed17998f4dc69 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Mon, 13 Jul 2026 15:46:40 +1000 Subject: [PATCH] =?UTF-8?q?fix:=20Cicd=20=D0=B4=D0=BB=D1=8F=20SnapshotWork?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5681e1e..920c395d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1025,8 +1025,6 @@ prod_snapshots_build: command: [ "--insecure-registry=10.99.253.167:8090", "--registry-mirror=http://10.99.253.167:8090", - "--insecure-registry=10.99.253.167:8088", - "--registry-mirror=http://10.99.253.167:8088", "--insecure-registry=harbor.dvgd.rzd", "--tls=false" ] @@ -1035,17 +1033,18 @@ prod_snapshots_build: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" script: - - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d sn) + - APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d sn) + - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/sn/v/g') - AUTHOR=$CI_COMMIT_AUTHOR - | docker build \ - -t $REPO/$PROD_SNAPSHOTS:$CI_COMMIT_TAG \ + -t $REPO/$PROD_SNAPSHOTS:IMAGE_VERSION \ -t $REPO/$PROD_SNAPSHOTS:latest \ - -t $PROD_SNAPSHOTS:$CI_COMMIT_TAG \ + -t $PROD_SNAPSHOTS:IMAGE_VERSION \ -t $PROD_SNAPSHOTS:latest \ - --build-arg app_version=$IMAGE_VERSION \ + --build-arg app_version=$APP_VERSION \ --build-arg commit_author="$AUTHOR" \ - -f PARR.API/Dockerfile . + -f PARR.SnapshotWorker/Dockerfile . - docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO - docker push --all-tags $REPO/$PROD_SNAPSHOTS tags: @@ -1055,16 +1054,16 @@ prod_snapshots_build: prod_snapshots_deploy: stage: deploy environment: - name: prod - url: http://10.99.253.216:8082/api/v1/version + name: parr-snapshots only: - /^sn[0-9]+\.[0-9]+\.[0-9]+$/ except: - branches script: + - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/sn/v/g') - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO #- tag=$CI_COMMIT_TAG docker compose up -d - - tag=$CI_COMMIT_TAG docker stack deploy -c docker-compose.snapshots.yml parr-snapshots --with-registry-auth + - tag=$IMAGE_VERSION docker stack deploy -c docker-compose.snapshots.yml parr-snapshots --with-registry-auth parallel: matrix: - RUNNER: shell-api-swarm-01