fix merge conflict

2025-11-23 05:28:35 +03:00
parent c2fe8a9d83 f92e3d3372
commit f07ef3ce60
26 changed files with 478 additions and 269 deletions
@@ -39,12 +39,14 @@ services:
    profiles:
      - backend
    ports:
-      - name: web
-        target: 8080
-        published: 13560
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
+      - 8080:8080
+    # ports:
+    #   - name: web
+    #     target: 8080
+    #     published: 13560
+    #     host_ip: 127.0.0.1
+    #     protocol: tcp
+    #     app_protocol: http
    restart: unless-stopped
    shm_size: 4mb
    volumes:
@@ -81,12 +83,14 @@ services:
    profiles:
      - ml
    ports:
-      - name: web
-        target: 8081
-        published: 13562
-        host_ip: 127.0.0.1
-        protocol: tcp
-        app_protocol: http
+      - 8081:8080
+    # ports:
+    #   - name: web
+    #     target: 8081
+    #     published: 13562
+    #     host_ip: 127.0.0.1
+    #     protocol: tcp
+        # app_protocol: http
    restart: unless-stopped
    shm_size: 4mb
    volumes: