mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Cicd для SnapshotWorker

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-07-13 15:46:40 +10:00
parent 50556ef605
commit 9f42a733e7
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.gitlab-ci.yml
View File

@@ -1025,8 +1025,6 @@ prod_snapshots_build:
command: [ command: [
"--insecure-registry=10.99.253.167:8090", "--insecure-registry=10.99.253.167:8090",
"--registry-mirror=http://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", "--insecure-registry=harbor.dvgd.rzd",
"--tls=false" "--tls=false"
] ]
@@ -1035,17 +1033,18 @@ prod_snapshots_build:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
script: 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 - AUTHOR=$CI_COMMIT_AUTHOR
- | - |
docker build \ docker build \
-t $REPO/$PROD_SNAPSHOTS:$CI_COMMIT_TAG \ -t $REPO/$PROD_SNAPSHOTS:IMAGE_VERSION \
-t $REPO/$PROD_SNAPSHOTS:latest \ -t $REPO/$PROD_SNAPSHOTS:latest \
-t $PROD_SNAPSHOTS:$CI_COMMIT_TAG \ -t $PROD_SNAPSHOTS:IMAGE_VERSION \
-t $PROD_SNAPSHOTS:latest \ -t $PROD_SNAPSHOTS:latest \
--build-arg app_version=$IMAGE_VERSION \ --build-arg app_version=$APP_VERSION \
--build-arg commit_author="$AUTHOR" \ --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 login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
- docker push --all-tags $REPO/$PROD_SNAPSHOTS - docker push --all-tags $REPO/$PROD_SNAPSHOTS
tags: tags:
@@ -1055,16 +1054,16 @@ prod_snapshots_build:
prod_snapshots_deploy: prod_snapshots_deploy:
stage: deploy stage: deploy
environment: environment:
name: prod name: parr-snapshots
url: http://10.99.253.216:8082/api/v1/version
only: only:
- /^sn[0-9]+\.[0-9]+\.[0-9]+$/ - /^sn[0-9]+\.[0-9]+\.[0-9]+$/
except: except:
- branches - branches
script: script:
- IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/sn/v/g')
- docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
#- tag=$CI_COMMIT_TAG docker compose up -d #- 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: parallel:
matrix: matrix:
- RUNNER: shell-api-swarm-01 - RUNNER: shell-api-swarm-01