diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67ecfd1c..434fdd1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,14 @@ prod_build: - branches services: - name: docker:20.10.21-dind - 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"] + 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" + ] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -43,10 +50,13 @@ prod_deploy: - branches script: - 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=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d parallel: matrix: - - RUNNER: shell-1 + - RUNNER: shell-api-swarm-01 + #- RUNNER: shell-1 tags: - ${RUNNER} @@ -62,7 +72,14 @@ prod_aihit_build: - branches services: - name: docker:20.10.21-dind - 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"] + 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" + ] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -105,7 +122,14 @@ prod_espp-template_build: - branches services: - name: docker:20.10.21-dind - 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"] + 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" + ] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 diff --git a/docker-compose.yml b/docker-compose.yml index a5614411..3c3dc3ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,26 +2,28 @@ version: '3.4' #API services: - rzdi-api: + parr-api: image: harbor.dvgd.rzd/parr/parr-api:${tag:-latest} - container_name: parr-api - restart: always + #container_name: parr-api + #restart: always environment: - ASPNETCORE_ENVIRONMENT=Production - TZ=Europe/Moscow ports: - 8082:80 - volumes: - - /var/log/parr-api:/app/log - - parr_storage_dev:/app/Data + #volumes: + #- /var/log/parr-api:/app/log + #- parr_storage_dev:/app/Data + deploy: + replicas: 2 -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 +#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 #tag=v1.0.0 docker compose up -d \ No newline at end of file diff --git a/stack.yml b/stack.yml index 23bc84e0..4a4773cb 100644 --- a/stack.yml +++ b/stack.yml @@ -1,5 +1,7 @@ version: "3.4" +# !!!not relevant!!! + services: parr-espp-template-sync: image: harbor.dvgd.rzd/parr/parr-espp-template-sync:${tag:-latest}