.deploy-infra/deploy-dev.yaml

@@ -33,9 +33,7 @@ services:
       start_period: 20s
       timeout: 10s
     ports:
-      - published: 5432
+      - "5432:5432"
-        target: 5432
-        mode: host
     deploy:
       mode: replicated
       restart_policy:
@@ -54,9 +52,7 @@ services:
       MONGO_INITDB_ROOT_USERNAME: mongo
       MONGO_INITDB_ROOT_PASSWORD: $MONGO_PASSWORD_DEV
     ports:
-      - published: 27017
+      - "27017:27017"
-        target: 27017
-        mode: host
     deploy:
       mode: replicated
       restart_policy:
@@ -72,12 +68,8 @@ services:
     volumes:
       - /sprint-data/rabbitmq:/var/lib/rabbitmq
     ports:
-      - published: 5672
+      - "5672:5672"
-        target: 5672
+      - "15672:15672"
-        mode: host
-      - published: 15672
-        target: 15672
-        mode: host
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
     deploy:
@@ -95,9 +87,7 @@ services:
     volumes:
       - /sprint-data/redis:/data
     ports:
-      - published: 6379
+      - "6379:6379"
-        target: 6379
-        mode: host
     command: redis-server --requirepass $REDIS_PASSWORD_DEV
     deploy:
       mode: replicated
@@ -117,12 +107,8 @@ services:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV
     ports:
-      - published: 9000
+      - "9000:9000"
-        target: 9000
+      - "9001:9001"
-        mode: host
-      - published: 9001
-        target: 9001
-        mode: host
     deploy:
       mode: replicated
       placement:
@@ -158,5 +144,7 @@ volumes:
     driver: local
 
 networks:
+  net:
+    driver: overlay
   common-infra-nginx-development:
     external: true

.deploy-infra/deploy-prod.yaml

@@ -33,9 +33,7 @@ services:
       start_period: 20s
       timeout: 10s
     ports:
-      - published: 5432
+      - "5432:5432"
-        target: 5432
-        mode: host
     deploy:
       mode: replicated
       restart_policy:
@@ -59,9 +57,7 @@ services:
       MONGO_INITDB_ROOT_USERNAME: mongo
       MONGO_INITDB_ROOT_PASSWORD: $MONGO_PASSWORD_PROD
     ports:
-      - published: 27017
+      - "27017:27017"
-        target: 27017
-        mode: host
     deploy:
       mode: replicated
       restart_policy:
@@ -77,12 +73,8 @@ services:
     volumes:
       - /sprint-data/rabbitmq:/var/lib/rabbitmq
     ports:
-      - published: 5672
+      - "5672:5672"
-        target: 5672
+      - "15672:15672"
-        mode: host
-      - published: 15672
-        target: 15672
-        mode: host
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
     deploy:
@@ -100,9 +92,7 @@ services:
     volumes:
       - /sprint-data/redis:/data
     ports:
-      - published: 6379
+      - "6379:6379"
-        target: 6379
-        mode: host
     command: redis-server --requirepass $REDIS_PASSWORD_PROD
     deploy:
       mode: replicated
@@ -122,12 +112,8 @@ services:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD
     ports:
-      - published: 9000
+      - "9000:9000"
-        target: 9000
+      - "9001:9001"
-        mode: host
-      - published: 9001
-        target: 9001
-        mode: host
     deploy:
       mode: replicated
       placement:

.gitea/workflows/deploy-dev.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: [ prod ]
+    runs-on: [ dev ]
     steps:
       - name: login
         run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -23,30 +23,16 @@ jobs:
         run: docker build -t mathwave/sprint-repo:gitea-runner gitea-runner
   push:
     name: Push
-    runs-on: [ prod ]
+    runs-on: [ dev ]
     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: [prod]
+    runs-on: [dev]
-    # needs: prepare
     needs: push
     steps:
       - name: login
@@ -55,6 +41,8 @@ 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 }}

.gitea/workflows/deploy-prod.yaml

@@ -30,19 +30,6 @@ 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]
@@ -54,6 +41,8 @@ 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