Retrait des profiles

compose.bi.yaml

@@ -2,7 +2,7 @@
 # Business Intelligence
 #
 # ----------------------------------------------------------------------
-
+services:
   superset:
     image: apache/superset:3.1.3
     depends_on:
@@ -28,8 +28,6 @@
       caddy: superset.localhost
       caddy.reverse_proxy: "{{upstreams 80}}"
       caddy.tls: internal
-    profiles:
-      - bi
 
   metabase:
     image: metabase/metabase:v0.56.5.5
@@ -61,16 +59,12 @@
       caddy: superset.localhost
       caddy.reverse_proxy: "{{upstreams 80}}"
       caddy.tls: internal
-    profiles:
-      - bi
 
   metabase-init:
     build:
       context: ./metabase
     depends_on:
       - metabase
-    profiles:
-      - bi
 
 volumes:
   superset_home:

compose.yaml

@@ -15,14 +15,20 @@ services:
       - "80:80"
       - "443:443/tcp"
       - "443:443/udp"
-      - "2019:2019"
     networks:
       - caddy_net
     environment:
       CADDY_INGRESS_NETWORKS: ${COMPOSE_PROJECT_NAME}_caddy_net
     volumes:
-      - ./data:/usr/share/caddy
+      - caddy_config:/config
+      - caddy_data:/data
+      - ./data:/srv/www:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
+    labels:
+      caddy: "static.localhost"
+      caddy.root: "* /srv/www"
+      caddy.file_server: ""
+      caddy.tls: internal
 
   whoami:
     image: traefik/whoami
@@ -75,8 +81,8 @@ services:
     volumes:
       - pgadmin:/var/lib/pgadmin/
     environment:
-      PGADMIN_DEFAULT_EMAIL: ${ADMIN_EMAIL}
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${ADMIN_PASSWORD}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
       PGADMIN_DISABLE_POSTFIX: true
     networks:
       - caddy_net
@@ -84,8 +90,6 @@ services:
       caddy: pgadmin.localhost
       caddy.reverse_proxy: "{{upstreams 80}}"
       caddy.tls: internal
-    profiles:
-      - admin
 
 # ----------------------------------------------------------------------
 # Documents
@@ -96,7 +100,7 @@ services:
 # Single-node document database
 # https://couchdb.apache.org/
   couchdb:
-    image: couchdb:${COUCH_DB_VERSION:-3.5}
+    image: couchdb:3.5
     volumes:
       - couchdb_data:/opt/couchdb/data
     ports:
@@ -104,8 +108,6 @@ services:
     environment:
       COUCHDB_USER: ${COUCHDB_USER}
       COUCHDB_PASSWORD: ${COUCHDB_PASSWORD}
-    profiles:
-      - documents
 
 # MongoDB
 #
@@ -122,8 +124,6 @@ services:
     environment:
       MONGODB_INITDB_ROOT_USERNAME: ${MONGODB_USER}
       MONGODB_INITDB_ROOT_PASSWORD: ${MONGODB_PASSWORD}
-    profiles:
-      - documents
 
 # Redis
 # In-memory key-value database
@@ -337,6 +337,7 @@ services:
 
 volumes:
   caddy_config:
+  caddy_data:
   pgadmin:
   database_data:
   couchdb_data: