Actualiser compose.yml

compose.yml

@@ -1,10 +1,5 @@
 name: scanopy
 
-x-scanopy-env: &scanopy-env
-  SCANOPY_LOG_LEVEL: ${SCANOPY_LOG_LEVEL:-info}
-  SCANOPY_SERVER_PORT: ${SCANOPY_SERVER_PORT:-60072}
-  SCANOPY_DAEMON_PORT: ${SCANOPY_DAEMON_PORT:-60073}
-
 services:
   daemon:
     image: ghcr.io/scanopy/scanopy/daemon:latest
@@ -15,9 +10,9 @@ services:
     ports:
       - "60073:60073"
     env_file:
-      - .env
+      - daemon.env
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:${SCANOPY_DAEMON_PORT:-60073}/api/health || exit 1"]
+      test: ["CMD-SHELL", "curl -f http://localhost:${SCANOPY_DAEMON_PORT}/api/health || exit 1"]
       interval: 5s
       timeout: 3s
       retries: 15
@@ -29,7 +24,7 @@ services:
   postgres:
     image: postgres:17-alpine
     env_file:
-      - .env
+      - pgsql.env
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
@@ -46,14 +41,14 @@ services:
     ports:
       - "60072:60072"
     env_file:
-      - .env
+      - server.env
     volumes:
       - ./data:/data
     depends_on:
       postgres:
         condition: service_healthy
-    #  daemon:
+      daemon:
-    #    condition: service_healthy
+        condition: service_healthy
     restart: unless-stopped
     networks:
       - scanopy