From ae6066a5e72606729700a1cd03acd812f6c981e1 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 23 Nov 2024 20:28:17 +0300 Subject: [PATCH 1/4] try --- .gitea/workflows/deploy-dev.yaml | 22 +++++++++++++++++----- .gitea/workflows/deploy-prod.yaml | 15 +++++++++++++-- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 8380cc8..81cfe48 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -9,7 +9,7 @@ on: jobs: build: name: Build - runs-on: [ dev ] + runs-on: [ prod ] steps: - name: login run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} @@ -23,16 +23,30 @@ jobs: run: docker build -t mathwave/sprint-repo:gitea-runner gitea-runner push: name: Push - runs-on: [ dev ] + runs-on: [ prod ] needs: build steps: - name: push nginx dev run: docker push mathwave/sprint-repo:sprint-infra-nginx-dev - name: push gitea runner run: docker push mathwave/sprint-repo:gitea-runner + # prepare: + # name: prepare + # runs-on: [dev] + # needs: push + # steps: + # - name: login + # run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + # - name: checkout + # uses: actions/checkout@v4 + # with: + # ref: dev + # - name: prepare + # run: chmod 777 ./prepare/run-development.sh && ./prepare/run-development.sh deploy-dev: name: Deploy dev - runs-on: [dev] + runs-on: [prod] + # needs: prepare needs: push steps: - name: login @@ -41,8 +55,6 @@ jobs: uses: actions/checkout@v4 with: ref: dev - - name: prepare - run: chmod 777 ./prepare/run-development.sh && ./prepare/run-development.sh - name: deploy infra env: MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index e7a3b8a..5c555a7 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -30,6 +30,19 @@ jobs: run: docker push mathwave/sprint-repo:sprint-infra-nginx-prod - name: push gitea runner run: docker push mathwave/sprint-repo:gitea-runner + prepare: + name: prepare + runs-on: [prod] + needs: push + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: dev + - name: prepare + run: chmod 777 ./prepare/run-production.sh && ./prepare/run-production.sh deploy-prod: name: Deploy prod runs-on: [prod] @@ -41,8 +54,6 @@ jobs: uses: actions/checkout@v4 with: ref: prod - - name: prepare - run: chmod 777 ./prepare/run-production.sh && ./prepare/run-production.sh - name: deploy swarmpit run: docker stack deploy --with-registry-auth -c ./.deploy-swarmpit/deploy-prod.yaml swarmpit - name: deploy portainer From b35dea681192801abae8960376f265ea7c44eb6d Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 23 Nov 2024 20:48:49 +0300 Subject: [PATCH 2/4] fix --- .deploy-infra/deploy-dev.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 66c8168..4459c3e 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -22,6 +22,8 @@ services: postgres: image: postgres:14-alpine3.19 + networks: + - postgres-development volumes: - /sprint-data/postgres-data:/var/lib/postgresql/data environment: @@ -46,6 +48,8 @@ services: mongo: image: mongo:6.0.2 + networks: + - mongo-development volumes: - /sprint-data/mongo:/data/db environment: @@ -65,6 +69,8 @@ services: rabbitmq: image: rabbitmq:3.10.7-management + networks: + - rabbitmq-development volumes: - /sprint-data/rabbitmq:/var/lib/rabbitmq ports: @@ -84,6 +90,8 @@ services: redis: image: redis:alpine3.16 + networks: + - redis-development volumes: - /sprint-data/redis:/data ports: @@ -101,6 +109,8 @@ services: minio: image: bitnami/minio:2022.10.8 + networks: + - minio-development volumes: - minio_data:/data environment: @@ -148,3 +158,18 @@ networks: driver: overlay common-infra-nginx-development: external: true + postgres-development: + name: host + external: true + mongo-development: + name: host + external: true + rabbitmq-development: + name: host + external: true + minio-development: + name: host + external: true + redis-development: + name: host + external: true From 0ab80c81a42cd7e4ee08557b02d9f04417fdcb87 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 23 Nov 2024 21:01:03 +0300 Subject: [PATCH 3/4] fix --- .deploy-infra/deploy-dev.yaml | 55 +++++++++++++---------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 4459c3e..e9c78e4 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -22,8 +22,6 @@ services: postgres: image: postgres:14-alpine3.19 - networks: - - postgres-development volumes: - /sprint-data/postgres-data:/var/lib/postgresql/data environment: @@ -35,7 +33,9 @@ services: start_period: 20s timeout: 10s ports: - - "5432:5432" + - published: 5432 + target: 5432 + mode: host deploy: mode: replicated restart_policy: @@ -48,15 +48,15 @@ services: mongo: image: mongo:6.0.2 - networks: - - mongo-development volumes: - /sprint-data/mongo:/data/db environment: MONGO_INITDB_ROOT_USERNAME: mongo MONGO_INITDB_ROOT_PASSWORD: $MONGO_PASSWORD_DEV ports: - - "27017:27017" + - published: 27017 + target: 27017 + mode: host deploy: mode: replicated restart_policy: @@ -69,13 +69,15 @@ services: rabbitmq: image: rabbitmq:3.10.7-management - networks: - - rabbitmq-development volumes: - /sprint-data/rabbitmq:/var/lib/rabbitmq ports: - - "5672:5672" - - "15672:15672" + - published: 5672 + target: 5672 + mode: host + - published: 15672 + target: 15672 + mode: host environment: RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV deploy: @@ -90,12 +92,12 @@ services: redis: image: redis:alpine3.16 - networks: - - redis-development volumes: - /sprint-data/redis:/data ports: - - "6379:6379" + - published: 6379 + target: 6379 + mode: host command: redis-server --requirepass $REDIS_PASSWORD_DEV deploy: mode: replicated @@ -109,16 +111,18 @@ services: minio: image: bitnami/minio:2022.10.8 - networks: - - minio-development volumes: - minio_data:/data environment: MINIO_ROOT_USER: minioadmin MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV ports: - - "9000:9000" - - "9001:9001" + - published: 9000 + target: 9000 + mode: host + - published: 9001 + target: 9001 + mode: host deploy: mode: replicated placement: @@ -154,22 +158,5 @@ volumes: driver: local networks: - net: - driver: overlay common-infra-nginx-development: external: true - postgres-development: - name: host - external: true - mongo-development: - name: host - external: true - rabbitmq-development: - name: host - external: true - minio-development: - name: host - external: true - redis-development: - name: host - external: true From fc0a69a9ed2c4abe3ad65a459c1e9aa166fa7b94 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 23 Nov 2024 21:05:31 +0300 Subject: [PATCH 4/4] prod --- .deploy-infra/deploy-prod.yaml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 27b11a6..cb2defe 100644 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -33,7 +33,9 @@ services: start_period: 20s timeout: 10s ports: - - "5432:5432" + - published: 5432 + target: 5432 + mode: host deploy: mode: replicated restart_policy: @@ -57,7 +59,9 @@ services: MONGO_INITDB_ROOT_USERNAME: mongo MONGO_INITDB_ROOT_PASSWORD: $MONGO_PASSWORD_PROD ports: - - "27017:27017" + - published: 27017 + target: 27017 + mode: host deploy: mode: replicated restart_policy: @@ -73,8 +77,12 @@ services: volumes: - /sprint-data/rabbitmq:/var/lib/rabbitmq ports: - - "5672:5672" - - "15672:15672" + - published: 5672 + target: 5672 + mode: host + - published: 15672 + target: 15672 + mode: host environment: RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD deploy: @@ -92,7 +100,9 @@ services: volumes: - /sprint-data/redis:/data ports: - - "6379:6379" + - published: 6379 + target: 6379 + mode: host command: redis-server --requirepass $REDIS_PASSWORD_PROD deploy: mode: replicated @@ -112,8 +122,12 @@ services: MINIO_ROOT_USER: minioadmin MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD ports: - - "9000:9000" - - "9001:9001" + - published: 9000 + target: 9000 + mode: host + - published: 9001 + target: 9001 + mode: host deploy: mode: replicated placement: