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

test api swarm

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-09-14 10:15:46 +10:00
parent 7610484b11
commit be848ea0b3
3 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.gitlab-ci.yml
View File

@@ -18,7 +18,14 @@ prod_build:
- branches - branches
services: services:
- name: docker:20.10.21-dind - 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: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -43,10 +50,13 @@ prod_deploy:
- branches - branches
script: script:
- 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=$IMAGE_VERSION docker compose -f docker-compose.aihit-syncher.yml up -d
parallel: parallel:
matrix: matrix:
- RUNNER: shell-1 - RUNNER: shell-api-swarm-01
#- RUNNER: shell-1
tags: tags:
- ${RUNNER} - ${RUNNER}
@@ -62,7 +72,14 @@ prod_aihit_build:
- branches - branches
services: services:
- name: docker:20.10.21-dind - 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: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@@ -105,7 +122,14 @@ prod_espp-template_build:
- branches - branches
services: services:
- name: docker:20.10.21-dind - 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: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2

30
docker-compose.yml
View File

@@ -2,26 +2,28 @@ version: '3.4'
#API #API
services: services:
rzdi-api: parr-api:
image: harbor.dvgd.rzd/parr/parr-api:${tag:-latest} image: harbor.dvgd.rzd/parr/parr-api:${tag:-latest}
container_name: parr-api #container_name: parr-api
restart: always #restart: always
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- TZ=Europe/Moscow - TZ=Europe/Moscow
ports: ports:
- 8082:80 - 8082:80
volumes: #volumes:
- /var/log/parr-api:/app/log #- /var/log/parr-api:/app/log
- parr_storage_dev:/app/Data #- parr_storage_dev:/app/Data
deploy:
replicas: 2
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
#tag=v1.0.0 docker compose up -d #tag=v1.0.0 docker compose up -d

2
stack.yml
View File

@@ -1,5 +1,7 @@
version: "3.4" version: "3.4"
# !!!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}