Procházet zdrojové kódy

fix: Types directory mount merge conflicts

Owen Diffey před 1 rokem
rodič
revize
36b02107bc
2 změnil soubory, kde provedl 2 přidání a 4 odebrání
  1. 0 2
      docker-compose.dev.yml
  2. 2 2
      docker-compose.yml

+ 0 - 2
docker-compose.dev.yml

@@ -4,12 +4,10 @@ services:
       - "${BACKEND_HOST:-0.0.0.0}:${BACKEND_PORT:-8080}:8080"
     volumes:
       - ./backend:/opt/app
-      - ./types:/opt/types
 
   frontend:
     volumes:
       - ./frontend:/opt/app
-      - ./types:/opt/types
 
   mongo:
     ports:

+ 2 - 2
docker-compose.yml

@@ -9,7 +9,7 @@ services:
     volumes:
       - ./.git:/opt/app/.parent_git:ro
       - ./backend/config:/opt/app/config
-      - ./@musare_types:/opt/@musare_types
+      - ./types:/opt/types
     environment:
       - CONTAINER_MODE=${CONTAINER_MODE:-prod}
     links:
@@ -31,7 +31,7 @@ services:
     volumes:
       - ./.git:/opt/app/.parent_git:ro
       - ./frontend/dist/config:/opt/app/dist/config
-      - ./@musare_types:/opt/@musare_types
+      - ./types:/opt/types
     environment:
       - FRONTEND_MODE=${FRONTEND_MODE:-prod}
       - CONTAINER_MODE=${CONTAINER_MODE:-prod}