resolve conflicts

compose.yaml

@@ -1,122 +1,12 @@
 name: datarush
 
 services:
-  auth:
-    build:
-      context: .
-      dockerfile: Containerfile
-    depends_on:
-      postgres:
-        restart: false
-        condition: service_healthy
-        required: true
-    env_file:
-      - path: ./infrastructure/auth/.env.template
-        required: true
-      - path: ./infrastructure/auth/.env
-        required: false
-    ports:
-      - name: http
-        target: 8081
-        published: 13443
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-      - name: grpc
-        target: 50052
-        published: 13444
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-    networks:
-      - default
-    restart: unless-stopped
-    shm_size: 4mb
-
-  competition:
-    build:
-      context: .
-      dockerfile: Containerfile
-    depends_on:
-      postgres:
-        restart: false
-        condition: service_healthy
-        required: true
-      redis:
-        restart: false
-        condition: service_healthy
-        required: true
-      auth:
-        restart: false
-        condition: service_started
-        required: true
-    env_file:
-      - path: ./infrastructure/competition/.env.template
-        required: true
-      - path: ./infrastructure/competition/.env
-        required: false
-    ports:
-      - name: http
-        target: 8082
-        published: 13445
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-      - name: grpc
-        target: 50053
-        published: 13446
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-    networks:
-      - default
-    restart: unless-stopped
-    shm_size: 4mb
-
-  task:
-    build:
-      context: .
-      dockerfile: Containerfile
-    depends_on:
-      postgres:
-        restart: false
-        condition: service_healthy
-        required: true
-      redis:
-        restart: false
-        condition: service_healthy
-        required: true
-      auth:
-        restart: false
-        condition: service_started
-        required: true
-    env_file:
-      - path: ./infrastructure/task/.env.template
-        required: true
-      - path: ./infrastructure/task/.env
-        required: false
-    ports:
-      - name: http
-        target: 8083
-        published: 13447
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-      - name: grpc
-        target: 50054
-        published: 13448
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-    networks:
-      - default
-    restart: unless-stopped
-    shm_size: 4mb
-
-  core:
+  gw:
     build:
       context: .
       dockerfile: Containerfile
+      args:
+        SERVICE: gw
     depends_on:
       migrate:
         restart: false
@@ -143,22 +33,10 @@ services:
         condition: service_started
         required: true
     env_file:
-      - path: ./infrastructure/core/.env.template
+      - path: ./infrastructure/gw/.env.template
         required: true
-      - path: ./infrastructure/core/.env
-    ports:
-      - name: http
-        target: 8080
-        published: 13440
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
-      - name: grpc
-        target: 50051
-        published: 13441
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
+      - path: ./infrastructure/gw/.env
+        required: false
     networks:
       - default
     restart: unless-stopped
@@ -168,20 +46,131 @@ services:
     build:
       context: .
       dockerfile: Containerfile
+      args:
+        SERVICE: migrate
     depends_on:
       postgres:
         restart: false
         condition: service_healthy
         required: true
     env_file:
-      - path: ./infrastructure/core/.env.template
+      - path: ./infrastructure/migrate/.env.template
         required: true
-      - path: ./infrastructure/core/.env
+      - path: ./infrastructure/migrate/.env
+        required: false
     networks:
       - default
     restart: no
     shm_size: 4mb
 
+  auth:
+    build:
+      context: .
+      dockerfile: Containerfile
+      args:
+        SERVICE: auth
+    depends_on:
+      postgres:
+        restart: false
+        condition: service_healthy
+        required: true
+    env_file:
+      - path: ./infrastructure/auth/.env.template
+        required: true
+      - path: ./infrastructure/auth/.env
+        required: false
+    networks:
+      - default
+    restart: unless-stopped
+    shm_size: 4mb
+
+  competition:
+    build:
+      context: .
+      dockerfile: Containerfile
+      args:
+        SERVICE: competition
+    depends_on:
+      postgres:
+        restart: false
+        condition: service_healthy
+        required: true
+      redis:
+        restart: false
+        condition: service_healthy
+        required: true
+      auth:
+        restart: false
+        condition: service_started
+        required: true
+    env_file:
+      - path: ./infrastructure/competition/.env.template
+        required: true
+      - path: ./infrastructure/competition/.env
+        required: false
+    networks:
+      - default
+    restart: unless-stopped
+    shm_size: 4mb
+
+  task:
+    build:
+      context: .
+      dockerfile: Containerfile
+      args:
+        SERVICE: task
+    depends_on:
+      postgres:
+        restart: false
+        condition: service_healthy
+        required: true
+      redis:
+        restart: false
+        condition: service_healthy
+        required: true
+      auth:
+        restart: false
+        condition: service_started
+        required: true
+    env_file:
+      - path: ./infrastructure/task/.env.template
+        required: true
+      - path: ./infrastructure/task/.env
+        required: false
+    networks:
+      - default
+    restart: unless-stopped
+    shm_size: 4mb
+
+  nginx:
+    image: docker.io/nginx:1.29-alpine
+    configs:
+      - source: nginx_config
+        target: /etc/nginx/nginx.conf
+    depends_on:
+      gw:
+        restart: false
+        condition: service_started
+        required: true
+    healthcheck:
+      test: ["CMD", "wget", "-O", "-", "http://localhost:80/healthz"]
+      interval: 1m30s
+      timeout: 5s
+      start_period: 5s
+      start_interval: 2s
+      retries: 5
+    ports:
+      - name: web
+        target: 80
+        published: 8080
+        host_ip: 0.0.0.0
+        protocol: tcp
+        app_protocol: http
+    networks:
+      - default
+    restart: unless-stopped
+    shm_size: 4mb
+
   postgres:
     image: docker.io/postgres:17-alpine
     configs:
@@ -278,6 +267,60 @@ services:
         target: /data
         read_only: false
 
+  minio-init:
+    image: docker.io/minio/minio:RELEASE.2025-09-07T16-13-09Z
+    entrypoint: >
+      /bin/sh -c "
+      sleep 5;
+      /usr/bin/mc alias set minio http://minio:9000 admin password;
+      /usr/bin/mc mb minio/datarush;
+      exit 0;
+      "
+    env_file:
+      - path: ./infrastructure/minio/.env.template
+        required: true
+      - path: ./infrastructure/minio/.env
+        required: false
+    restart: no
+    volumes:
+      - type: volume
+        source: minio_data
+        target: /data
+
+  minio:
+    image: docker.io/minio/minio:RELEASE.2025-09-07T16-13-09Z
+    command: server --console-address ":9001"
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 1m30s
+      timeout: 5s
+      start_period: 5s
+      start_interval: 2s
+      retries: 5
+    env_file:
+      - path: ./infrastructure/minio/.env.template
+        required: true
+      - path: ./infrastructure/minio/.env
+        required: false
+    ports:
+      - name: api
+        target: 9000
+        published: 8005
+        host_ip: 127.0.0.1
+        protocol: tcp
+        app_protocol: http
+      - name: console
+        target: 9001
+        published: 8006
+        host_ip: 127.0.0.1
+        protocol: tcp
+        app_protocol: http
+    restart: unless-stopped
+    volumes:
+      - type: volume
+        source: minio_data
+        target: /data
+
 networks:
   default:
     driver: bridge
@@ -291,8 +334,11 @@ volumes:
   postgres_data:
   pgadmin_data:
   redis_data:
+  minio_data:
 
 configs:
+  nginx_config:
+    file: ./infrastructure/nginx/nginx.conf
   postgres_config:
     file: ./infrastructure/postgres/postgresql.conf
   pgadmin_servers_config: