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

no message

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-09-14 11:33:13 +10:00
parent be848ea0b3
commit 066c1dad64
4 changed files with 97 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.gitlab-ci.yml
View File

@@ -43,7 +43,7 @@ prod_deploy:
stage: deploy stage: deploy
environment: environment:
name: prod name: prod
url: http://10.99.253.215:8082/api/v1/version url: http://10.99.253.216:8082/api/v1/version
only: only:
- /^v[0-9]+\.[0-9]+\.[0-9]+$/ - /^v[0-9]+\.[0-9]+\.[0-9]+$/
except: except:
@@ -52,7 +52,6 @@ prod_deploy:
- 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.yml parr-api --with-registry-auth - tag=$CI_COMMIT_TAG docker stack deploy -c docker-compose.yml parr-api --with-registry-auth
# tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d
parallel: parallel:
matrix: matrix:
- RUNNER: shell-api-swarm-01 - RUNNER: shell-api-swarm-01
@@ -144,20 +143,22 @@ prod_espp-template_build:
- docker-et - docker-et
# prod_espp-template_deploy: prod_espp-template_deploy:
# stage: deploy stage: deploy
# environment: environment:
# name: parr-espp-template-sync name: parr-espp-template-sync
# only: only:
# - /^et[0-9]+\.[0-9]+\.[0-9]+$/ - /^et[0-9]+\.[0-9]+\.[0-9]+$/
# except: except:
# - branches - branches
# script: script:
# - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/v/g') - IMAGE_VERSION=$(echo $CI_COMMIT_TAG | sed 's/et/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=$IMAGE_VERSION docker compose -f docker-compose.espp-template-sync.yml up -d #- tag=$IMAGE_VERSION docker compose -f docker-compose.espp-template-sync.yml up -d
# parallel: - tag=$CI_COMMIT_TAG docker stack deploy -c docker-compose.espp-template-sync.yml parr-espp --with-registry-auth
# matrix: parallel:
matrix:
- RUNNER: shell-api-swarm-01
#- RUNNER: shell-et-1 #- RUNNER: shell-et-1
# tags: tags:
# - ${RUNNER} - ${RUNNER}

1
README.md
View File

@@ -25,6 +25,7 @@
## Настройка хранилища ## Настройка хранилища
### Не используется
``` ```
#dev #dev
\\dvgd-appfs-01\parr_storage_dev \\dvgd-appfs-01\parr_storage_dev

44
docker-compose.espp-template-sync.yml
View File

@@ -4,23 +4,47 @@ version: '3.4'
services: services:
parr-espp-template-sync: parr-espp-template-sync:
image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest} image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest}
container_name: parr-espp-template-sync #container_name: parr-espp-template-sync
restart: always #restart: always
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- TZ=Europe/Moscow - TZ=Europe/Moscow
#volumes:
#- /var/log/parr-espp-template-sync:/app/log
#- parr_storage_dev:/app/Data
deploy:
replicas: 6
rabbitmq:
image: rabbitmq:3.12.4-management
#container_name: rabbitmq
hostname: parr-rabbitmq
environment:
- RABBITMQ_DEFAULT_USER=rmuser
- RABBITMQ_DEFAULT_PASS=rmpassword
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log_levels [{connection,error},{default,error}] disk_free_limit 2147483648
volumes: volumes:
- /var/log/parr-espp-template-sync:/app/log - parr_rabbit:/var/lib/rabbitmq
- parr_storage_dev:/app/Data ports:
- 15672:15672
- 5672:5672
deploy:
replicas: 1
volumes: volumes:
parr_storage_dev: #parr_storage_dev:
name: parr_storage_dev #name: parr_storage_dev
driver: local #driver: local
#driver_opts:
#type: cifs
#o: "addr=dvgd-appfs-01,username=parruserdev,password=P@ssDevParr202MM"
#device: //dvgd-appfs-01/parr_storage_dev
parr_rabbit:
name: parr_rabbit
driver_opts: driver_opts:
type: cifs type: "nfs"
o: "addr=dvgd-appfs-01,username=parruserdev,password=P@ssDevParr202MM" o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4"
device: //dvgd-appfs-01/parr_storage_dev device: ":/nfs/dvgd-swarm-01/parr_rabbit/data"
# последняя версия # последняя версия
#docker compose -f docker-compose.espp-template-sync.yml up -d #docker compose -f docker-compose.espp-template-sync.yml up -d

84
stack.yml
View File

@@ -2,51 +2,51 @@ version: "3.4"
# !!!not relevant!!! # !!!not relevant!!!
services: # services:
parr-espp-template-sync: # parr-espp-template-sync:
image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest} # image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest}
container_name: parr-espp-template-sync # container_name: parr-espp-template-sync
restart: always # restart: always
environment: # environment:
- ASPNETCORE_ENVIRONMENT=Production # - ASPNETCORE_ENVIRONMENT=Production
- TZ=Europe/Moscow # - TZ=Europe/Moscow
# #volumes:
# #- /var/log/parr-espp-template-sync:/app/log
# #- parr_storage_dev:/app/Data
# deploy:
# replicas: 2
# rabbitmq:
# image: rabbitmq:3.12.4-management
# container_name: rabbitmq
# hostname: parr-rabbitmq
# environment:
# - RABBITMQ_DEFAULT_USER=rmuser
# - RABBITMQ_DEFAULT_PASS=rmpassword
# - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log_levels [{connection,error},{default,error}] disk_free_limit 2147483648
# volumes: # volumes:
#- /var/log/parr-espp-template-sync:/app/log # - parr_rabbit:/var/lib/rabbitmq
#- parr_storage_dev:/app/Data # ports:
deploy: # - 15672:15672
replicas: 2 # - 5672:5672
# deploy:
rabbitmq: # replicas: 1
image: rabbitmq:3.12.4-management
container_name: rabbitmq
hostname: parr-rabbitmq
environment:
- RABBITMQ_DEFAULT_USER=rmuser
- RABBITMQ_DEFAULT_PASS=rmpassword
- RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log_levels [{connection,error},{default,error}] disk_free_limit 2147483648
volumes:
- parr_rabbit:/var/lib/rabbitmq
ports:
- 15672:15672
- 5672:5672
deploy:
replicas: 1
volumes: # volumes:
parr_storage_dev: # parr_storage_dev:
name: parr_storage_dev # name: parr_storage_dev
driver: local # driver: local
driver_opts: # driver_opts:
type: cifs # type: cifs
o: "addr=dvgd-appfs-01,username=parruserdev,password=P@ssDevParr202MM" # o: "addr=dvgd-appfs-01,username=parruserdev,password=P@ssDevParr202MM"
device: //dvgd-appfs-01/parr_storage_dev # device: //dvgd-appfs-01/parr_storage_dev
parr_rabbit: # parr_rabbit:
name: parr_rabbit # name: parr_rabbit
driver_opts: # driver_opts:
type: "nfs" # type: "nfs"
o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4" # o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4"
device: ":/nfs/dvgd-swarm-01/parr_rabbit/data" # device: ":/nfs/dvgd-swarm-01/parr_rabbit/data"
# # --- NGINX --- # # --- NGINX ---