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

Fix RabbitMQ запись в БД. Репо перенастроен на harbor

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-09-04 12:17:50 +10:00
parent af21530d01
commit bd73c77027
14 changed files with 127 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@@ -1,5 +1,5 @@
variables:
REPO: "10.99.253.167:8088"
REPO: "harbor.dvgd.rzd"
PROD_NAME_API: "parr/parr-api"
PROD_NAME_AIHIT: "parr/parr-aihit-syncher"
PROD_NAME_ESPP_TEMPLATE: "parr/parr-espp-template-sync"
@@ -26,7 +26,7 @@ prod_build:
script:
- IMAGE_VERSION=$(echo $CI_COMMIT_TAG | tr -d v)
- docker build -t $REPO/$PROD_NAME_API:$CI_COMMIT_TAG -t $REPO/$PROD_NAME_API:latest -t $PROD_NAME_API:$CI_COMMIT_TAG -t $PROD_NAME_API:latest --build-arg app_version=$IMAGE_VERSION -f PARR.API/Dockerfile .
- docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
- docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
- docker push --all-tags $REPO/$PROD_NAME_API
tags:
- docker
@@ -42,6 +42,7 @@ prod_deploy:
except:
- branches
script:
- docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
- tag=$CI_COMMIT_TAG docker compose up -d
parallel:
matrix:
@@ -70,7 +71,7 @@ prod_aihit_build:
- APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d as)
- IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/as/v/g')
- 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 login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
- docker push --all-tags $REPO/$PROD_NAME_AIHIT
tags:
- docker-as
@@ -86,6 +87,7 @@ prod_aihit_deploy:
- branches
script:
- IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/as/v/g')
- docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
- tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d
parallel:
matrix:
@@ -112,7 +114,7 @@ prod_espp-template_build:
- APP_VERSION=$(echo $CI_COMMIT_TAG | tr -d et)
- IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/v/g')
- docker build -t $REPO/$PROD_NAME_ESPP_TEMPLATE:$IMAGE_VERSION -t $REPO/$PROD_NAME_ESPP_TEMPLATE:latest -t $PROD_NAME_ESPP_TEMPLATE:$IMAGE_VERSION -t $PROD_NAME_ESPP_TEMPLATE:latest --build-arg app_version=$APP_VERSION -f PARR.EsppTemplateSyncWorker/Dockerfile .
- docker login -u $NEXUS_PUSH_USER -p $NEXUS_PUSH_PASS $REPO
- docker login -u $HARBOR_PUSH_USER -p $HARBOR_PUSH_PASS $REPO
- docker push --all-tags $REPO/$PROD_NAME_ESPP_TEMPLATE
tags:
- docker-et
@@ -128,6 +130,7 @@ prod_espp-template_build:
# - branches
# script:
# - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/v/g')
# - docker login -u $HARBOR_PULL_USER -p $HARBOR_PULL_PASS $REPO
# - tag=$IMAGE_VERSION docker compose -f docker-compose.espp-template-sync.yml up -d
# parallel:
# matrix: