Fix dev mode with volumes for ARM (#208)

Co-authored-by: GitHub Actions <[email protected]>
datalens-tech · Oct 3, 2024 · 050f093 · 050f093
1 parent c0cd4fc
commit 050f093
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -55,8 +55,8 @@ services:
       POSTGRES_USER: demo
       POSTGRES_PASSWORD: demo
     volumes:
+      - db-demo:/var/lib/postgresql/data
       - ./pg-demo-connection/init:/docker-entrypoint-initdb.d
-      - ./pg-demo-connection/data:/var/lib/postgresql/data
 
   pg-us:
     container_name: datalens-pg-us
@@ -66,7 +66,7 @@ services:
       POSTGRES_USER: us
       POSTGRES_PASSWORD: us
     volumes:
-      - ./metadata:/var/lib/postgresql/data
+      - db-us:/var/lib/postgresql/data
     ports:
       - "8086:5432"
 
@@ -114,3 +114,6 @@ services:
       HC: ${HC:-0}
       YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
       YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN}
+volumes:
+  db-us:
+  db-demo:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       POSTGRES_USER: demo
       POSTGRES_PASSWORD: demo
     volumes:
-      - ./pg-demo-connection/init:/docker-entrypoint-initdb.d
       - ./pg-demo-connection/data:/var/lib/postgresql/data
+      - ./pg-demo-connection/init:/docker-entrypoint-initdb.d
 
   pg-us:
     container_name: datalens-pg-us

diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2
@@ -59,8 +59,13 @@ services:
       POSTGRES_USER: demo
       POSTGRES_PASSWORD: demo
     volumes:
+{%- if "DEV_MODE"|env(false) %}
+      - db-demo:/var/lib/postgresql/data
       - ./pg-demo-connection/init:/docker-entrypoint-initdb.d
+{%- else %}
       - ./pg-demo-connection/data:/var/lib/postgresql/data
+      - ./pg-demo-connection/init:/docker-entrypoint-initdb.d
+{%- endif %}
 
   pg-us:
     container_name: datalens-pg-us
@@ -70,7 +75,11 @@ services:
       POSTGRES_USER: us
       POSTGRES_PASSWORD: us
     volumes:
+{%- if "DEV_MODE"|env(false) %}
+      - db-us:/var/lib/postgresql/data
+{%- else %}
       - ./metadata:/var/lib/postgresql/data
+{%- endif %}
 {%- if "DEV_MODE"|env(false) %}
     ports:
       - "8086:5432"
@@ -122,3 +131,9 @@ services:
       HC: ${HC:-0}
       YANDEX_MAP_ENABLED: ${YANDEX_MAP_ENABLED:-0}
       YANDEX_MAP_TOKEN: ${YANDEX_MAP_TOKEN}
+
+{%- if "DEV_MODE"|env(false) %}
+volumes:
+  db-us:
+  db-demo:
+{%- endif %}