Merge pull request 'master' (#143) from master into dev

Reviewed-on: https://gitea.chocomarsh.com/self/infra/pulls/143

.deploy-infra/deploy-dev.yaml

@@ -48,6 +48,8 @@ services:
 
   postgres:
     image: postgres:14-alpine3.19
+    networks:
+      - postgres-development
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     environment:
@@ -74,6 +76,8 @@ services:
 
   mongo:
     image: mongo:6.0.2
+    networks:
+      - mongo-development
     volumes:
       - /sprint-data/mongo:/data/db
     environment:
@@ -93,29 +97,6 @@ services:
         parallelism: 1
         order: start-first 
 
-  rabbitmq:
-    image: rabbitmq:3.10.7-management
-    volumes:
-      - /sprint-data/rabbitmq:/var/lib/rabbitmq
-    ports:
-      - published: 5672
-        target: 5672
-        mode: host
-      - published: 15672
-        target: 15672
-        mode: host
-    environment:
-      RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      placement:
-        constraints: [node.labels.stage == development]
-      update_config:
-        parallelism: 1
-        order: start-first
-
   redis:
     image: redis:alpine3.16
     volumes:
@@ -137,6 +118,8 @@ services:
 
   minio:
     image: bitnami/minio:2022.10.8
+    networks:
+      - minio-development
     volumes:
       - minio_data:/data
     environment:
@@ -190,3 +173,9 @@ networks:
     external: true
   clickhouse-development:
     external: true
+  postgres-development:
+    external: true
+  mongo-development:
+    external: true
+  minio-development:
+    external: true

.deploy-infra/deploy-prod.yaml

@@ -77,6 +77,8 @@ services:
 
   postgres:
     image: postgres:14-alpine3.19
+    networks:
+      - postgres
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     environment:
@@ -108,6 +110,8 @@ services:
 
   mongo:
     image: mongo:6.0.2
+    networks:
+      - mongo
     volumes:
       - /sprint-data/mongo:/data/db
     environment:
@@ -148,6 +152,8 @@ services:
 
   minio:
     image: bitnami/minio:2022.10.8
+    networks:
+      - minio
     volumes:
       - minio_data:/data
     environment:
@@ -232,3 +238,9 @@ networks:
     external: true
   clickhouse:
     external: true
+  postgres:
+    external: true
+  mongo:
+    external: true
+  minio:
+    external: true

prepare/run-production.sh

@@ -8,10 +8,15 @@ docker network create -d overlay --attachable configurator || true
 docker network create -d overlay --attachable monitoring || true
 docker network create -d overlay --attachable configurator-development || true
 docker network create -d overlay --attachable clickhouse || true
-docker network create -d overlay --attachable clickhouse-development || true
+docker network create -d overlay --attachable postgres || true
+docker network create -d overlay --attachable postgres-development || true
+docker network create -d overlay --attachable mongo || true
+docker network create -d overlay --attachable mongo-development || true
+docker network create -d overlay --attachable minio || true
+docker network create -d overlay --attachable minio-development || true
+
 mkdir /sprint-data/mongo || true
 mkdir /sprint-data/redis || true
-mkdir /sprint-data/rabbitmq || true
 mkdir /sprint-data/certs || true
 mkdir /sprint-data/gitea || true
 mkdir /sprint-data/clickhouse || true