diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 434fdd1d..e642c50a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ prod_deploy: stage: deploy environment: name: prod - url: http://10.99.253.215:8082/api/v1/version + url: http://10.99.253.216:8082/api/v1/version only: - /^v[0-9]+\.[0-9]+\.[0-9]+$/ except: @@ -52,7 +52,6 @@ prod_deploy: - 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.yml parr-api --with-registry-auth - # tag=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d parallel: matrix: - RUNNER: shell-api-swarm-01 @@ -144,20 +143,22 @@ prod_espp-template_build: - docker-et -# prod_espp-template_deploy: -# stage: deploy -# environment: -# name: parr-espp-template-sync -# only: -# - /^et[0-9]+\.[0-9]+\.[0-9]+$/ -# except: -# - 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: -# - RUNNER: shell-et-1 -# tags: -# - ${RUNNER} \ No newline at end of file +prod_espp-template_deploy: + stage: deploy + environment: + name: parr-espp-template-sync + only: + - /^et[0-9]+\.[0-9]+\.[0-9]+$/ + except: + - 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 + - tag=$CI_COMMIT_TAG docker stack deploy -c docker-compose.espp-template-sync.yml parr-espp --with-registry-auth + parallel: + matrix: + - RUNNER: shell-api-swarm-01 + #- RUNNER: shell-et-1 + tags: + - ${RUNNER} \ No newline at end of file diff --git a/README.md b/README.md index 865c79ad..5fff5646 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ ## Настройка хранилища +### Не используется ``` #dev \\dvgd-appfs-01\parr_storage_dev diff --git a/docker-compose.espp-template-sync.yml b/docker-compose.espp-template-sync.yml index 6263e18f..a58252c2 100644 --- a/docker-compose.espp-template-sync.yml +++ b/docker-compose.espp-template-sync.yml @@ -4,23 +4,47 @@ version: '3.4' services: parr-espp-template-sync: image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest} - container_name: parr-espp-template-sync - restart: always + #container_name: parr-espp-template-sync + #restart: always environment: - ASPNETCORE_ENVIRONMENT=Production - 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: - - /var/log/parr-espp-template-sync:/app/log - - parr_storage_dev:/app/Data + - parr_rabbit:/var/lib/rabbitmq + ports: + - 15672:15672 + - 5672:5672 + deploy: + replicas: 1 volumes: - parr_storage_dev: - name: parr_storage_dev - driver: local + #parr_storage_dev: + #name: parr_storage_dev + #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: - type: cifs - o: "addr=dvgd-appfs-01,username=parruserdev,password=P@ssDevParr202MM" - device: //dvgd-appfs-01/parr_storage_dev + type: "nfs" + o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4" + device: ":/nfs/dvgd-swarm-01/parr_rabbit/data" # последняя версия #docker compose -f docker-compose.espp-template-sync.yml up -d diff --git a/stack.yml b/stack.yml index 4a4773cb..257fdac0 100644 --- a/stack.yml +++ b/stack.yml @@ -2,51 +2,51 @@ version: "3.4" # !!!not relevant!!! -services: - parr-espp-template-sync: - image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest} - container_name: parr-espp-template-sync - restart: always - environment: - - ASPNETCORE_ENVIRONMENT=Production - - TZ=Europe/Moscow - #volumes: - #- /var/log/parr-espp-template-sync:/app/log - #- parr_storage_dev:/app/Data - deploy: - replicas: 2 +# services: +# parr-espp-template-sync: +# image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest} +# container_name: parr-espp-template-sync +# restart: always +# environment: +# - ASPNETCORE_ENVIRONMENT=Production +# - 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: - - parr_rabbit:/var/lib/rabbitmq - ports: - - 15672:15672 - - 5672:5672 - deploy: - replicas: 1 +# 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: +# - parr_rabbit:/var/lib/rabbitmq +# ports: +# - 15672:15672 +# - 5672:5672 +# deploy: +# replicas: 1 -volumes: - parr_storage_dev: - name: parr_storage_dev - 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: - type: "nfs" - o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4" - device: ":/nfs/dvgd-swarm-01/parr_rabbit/data" +# volumes: +# parr_storage_dev: +# name: parr_storage_dev +# 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: +# type: "nfs" +# o: "addr=dvgd-appfs-01.dvgd.oao.rzd,soft,rw,nfsvers=4" +# device: ":/nfs/dvgd-swarm-01/parr_rabbit/data" # # --- NGINX ---