Merge pull request 'join' (#23) from join into prod

Reviewed-on: #23

.deploy-infra/deploy-dev.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:
@@ -52,7 +54,9 @@ services:
       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:
@@ -68,8 +72,12 @@ services:
     volumes:
       - /sprint-data/rabbitmq:/var/lib/rabbitmq
     ports:
-      - "5672:5672"
+      - published: 5672
-      - "15672:15672"
+        target: 5672
+        mode: host
+      - published: 15672
+        target: 15672
+        mode: host
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
     deploy:
@@ -87,7 +95,9 @@ services:
     volumes:
       - /sprint-data/redis:/data
     ports:
-      - "6379:6379"
+      - published: 6379
+        target: 6379
+        mode: host
     command: redis-server --requirepass $REDIS_PASSWORD_DEV
     deploy:
       mode: replicated
@@ -107,8 +117,12 @@ services:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV
     ports:
-      - "9000:9000"
+      - published: 9000
-      - "9001:9001"
+        target: 9000
+        mode: host
+      - published: 9001
+        target: 9001
+        mode: host
     deploy:
       mode: replicated
       placement:
@@ -144,7 +158,5 @@ volumes:
     driver: local
 
 networks:
-  net:
-    driver: overlay
   common-infra-nginx-development:
     external: true

.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"
+      - published: 5672
-      - "15672:15672"
+        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"
+      - published: 9000
-      - "9001:9001"
+        target: 9000
+        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: [ 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 }}

.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