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

Reviewed-on: #140

.deploy-infra/deploy-dev.yaml

@@ -7,7 +7,6 @@ services:
     networks:
       - common-infra-nginx-development
       - configurator
-      - minio-development
     environment:
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
     ports:
@@ -49,8 +48,6 @@ services:
 
   postgres:
     image: postgres:14-alpine3.19
-    networks:
-      - postgres-development
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     environment:
@@ -77,8 +74,6 @@ services:
 
   mongo:
     image: mongo:6.0.2
-    networks:
-      - mongo-development
     volumes:
       - /sprint-data/mongo:/data/db
     environment:
@@ -98,6 +93,29 @@ 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:
@@ -119,8 +137,6 @@ services:
 
   minio:
     image: bitnami/minio:2022.10.8
-    networks:
-      - minio-development
     volumes:
       - minio_data:/data
     environment:
@@ -174,9 +190,3 @@ networks:
     external: true
   clickhouse-development:
     external: true
-  postgres-development:
-    external: true
-  mongo-development:
-    external: true
-  minio-development:
-    external: true

.deploy-infra/deploy-prod.yaml

@@ -7,7 +7,6 @@ services:
     networks:
       - common-infra-nginx
       - configurator
-      - minio
     environment:
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
     ports:
@@ -78,8 +77,6 @@ services:
 
   postgres:
     image: postgres:14-alpine3.19
-    networks:
-      - postgres
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     environment:
@@ -111,8 +108,6 @@ services:
 
   mongo:
     image: mongo:6.0.2
-    networks:
-      - mongo
     volumes:
       - /sprint-data/mongo:/data/db
     environment:
@@ -153,8 +148,6 @@ services:
 
   minio:
     image: bitnami/minio:2022.10.8
-    networks:
-      - minio
     volumes:
       - minio_data:/data
     environment:
@@ -178,9 +171,7 @@ services:
         order: start-first
 
   gitea:
-    image: gitea/gitea:1.25
+    image: gitea/gitea:1.22.3
-    networks:
-      - postgres
     volumes:
       - /sprint-data/gitea:/data
       - /etc/timezone:/etc/timezone
@@ -192,12 +183,10 @@ services:
       USER_UID: 1000
       USER_GID: 1000
       GITEA__database__DB_TYPE: postgres
-      GITEA__database__HOST: postgres:5432
+      GITEA__database__HOST: pg.chocomarsh.com:5432
       GITEA__database__NAME: gitea
       GITEA__database__USER: postgres
       GITEA__database__PASSWD: $DB_PASSWORD_PROD
-      GITEA__service__DISABLE_REGISTRATION: "true"
-      GITEA__server__ROOT_URL: "https://gitea.chocomarsh.com/"
     deploy:
       mode: replicated
       placement:
@@ -213,7 +202,6 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /sprint-data:/sprint-data
-      - /root/.cache/act:/root/.cache/act
     environment:
       GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/
       GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN
@@ -244,9 +232,3 @@ networks:
     external: true
   clickhouse:
     external: true
-  postgres:
-    external: true
-  mongo:
-    external: true
-  minio:
-    external: true

.deploy-portainer/deploy-prod.yaml

@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   agent:
-    image: portainer/agent:2.33.1
+    image: portainer/agent:2.11.1
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/volumes:/var/lib/docker/volumes
@@ -14,7 +14,7 @@ services:
         constraints: [node.platform.os == linux]
 
   portainer:
-    image: portainer/portainer-ce:2.33.1
+    image: portainer/portainer-ce:2.11.1
     command: -H tcp://tasks.agent:9001 --tlsskipverify
     ports:
       - "9443:9443"

gitea-runner/Dockerfile

@@ -3,4 +3,3 @@ FROM gitea/act_runner:nightly
 RUN apk add docker
 RUN apk add git
 RUN apk add --no-cache nodejs
-RUN apk add --no-cache make

nginx/nginx-dev/prepare.py

@@ -6,7 +6,7 @@ from json import loads
 
 
 minio_client = Minio(
-    "minio:9000",
+    "minio.dev.chocomarsh.com:9000",
     access_key="serviceminioadmin",
     secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
     secure=False,
@@ -30,22 +30,6 @@ except Exception as e:
 
 config = ""
 for host, params in hosts.items():
-    websocket = ""
-    for url in params.get("websocket", []):
-        websocket += """
-            location {url} {{
-                resolver 127.0.0.11;
-
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-
-                proxy_read_timeout 86400;
-                proxy_send_timeout 86400;
-
-                proxy_pass http://{target_host}:{port};
-            }}
-        """.format(url=url, target_host=params["host"], port=params["port"])
     config += """
         server {{
             listen      443 ssl http2;
@@ -55,7 +39,6 @@ for host, params in hosts.items():
             ssl_certificate     /etc/nginx/{host}/fullchain.pem;
             ssl_certificate_key /etc/nginx/{host}/privkey.pem;
 
-            proxy_http_version 1.1;
             add_header X-Frame-Options "SAMEORIGIN" always;
             add_header X-XSS-Protection "1; mode=block" always;
             add_header X-Content-Type-Options "nosniff" always;
@@ -65,16 +48,13 @@ for host, params in hosts.items():
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
 
-            {websocket}
-
             location / {{
                 resolver 127.0.0.11;
-                proxy_pass http://{target_host}:{port};
+                proxy_pass http://{target_host}:{port}$request_uri;
             }}
-
         }}\n\n
     """.format(
-        host=host, target_host=params["host"], port=params["port"], websocket=websocket
+        host=host, target_host=params["host"], port=params["port"]
     )
     try:
         fullchain = minio_client.get_object(

nginx/nginx-prod/prepare.py

@@ -6,7 +6,7 @@ from json import loads
 
 
 minio_client = Minio(
-    "minio:9000",
+    "minio.chocomarsh.com:9000",
     access_key="serviceminioadmin",
     secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
     secure=False,

prepare/run-production.sh

@@ -8,15 +8,10 @@ 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 postgres || true
+docker network create -d overlay --attachable clickhouse-development || 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