From a50c7cbcc23b745208ffc07def681a69b2d38e61 Mon Sep 17 00:00:00 2001
From: Hubert Cornet <hcornet@tips-of-mine.fr>
Date: Tue, 12 Mar 2024 22:05:58 +0100
Subject: [PATCH] Actualiser docker-compose.yml

---
 docker-compose.yml | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4454306..900822c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,47 @@
-
-version: '3'
+version: '3.7'
 
 # networks
 # create a network 'guacnetwork_net' in mode 'bridged'
 networks:
-  guacnetwork_net:
+  interne:
+    driver: overlay
+    attachable: true
+  externe:
     driver: bridge
+    attachable: true
 
 # services
 services:
   # guacd
   guacd:
-    container_name: guacamole_guacd
+    container_name: guacd
     image: guacamole/guacd:latest
     networks:
-      guacnetwork_net:
+      interne:
     restart: always
     volumes:
     - ./drive:/drive:rw
     - ./record:/record:rw
+
   # postgres
   postgres:
-    container_name: guacamole_postgres
+    container_name: postgres
     environment:
       PGDATA: /var/lib/postgresql/data/guacamole
       POSTGRES_DB: guacamole_db
       POSTGRES_PASSWORD: 'PasswordHere123456'
       POSTGRES_USER: guacamole_user
     image: postgres:15.2-alpine
-#    networks:
-#      guacnetwork_net:
+    networks:
+      interne:
     restart: always
     volumes:
     - ./init:/docker-entrypoint-initdb.d:z
-    - ./data:/var/lib/postgresql/data:Z
+    - ./data:/var/lib/postgresql/data:
 
   # guacamole
   guacamole:
-    container_name: guacamole_frontend
+    container_name: guacamole
     depends_on:
     - guacd
     - postgres
@@ -59,14 +63,26 @@ services:
     image: guacamole/guacamole:latest
     links:
     - guacd
-#    networks:
-#      guacnetwork_net:
-    ports:
+    networks:
+      interne:
+#    ports:
 ## enable next line if not using nginx
 ##    - 8080:8080/tcp # Guacamole is on :8080/guacamole, not /.
 ## enable next line when using nginx
-    - 8080/tcp
+#    - 8080/tcp
     restart: always
     volumes:
       - ./guacamole-config:/config
-
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=guacamole"
+#      - "traefik.http.routers.bastion.rule=Host(`guacamole.tips-of-mine.local`)"
+#      - "traefik.http.middlewares.guac-addprefix.addprefix.prefix=/guacamole"
+#      - "traefik.http.services.bastion.loadbalancer.server.port=8080"
+      - "traefik.http.services.guacamole.loadbalancer.server.port=8080"
+      - "traefik.http.routers.guacamole.rule=Host(`guacamole.tips-of-mine.local`)"
+      - "traefik.http.routers.guacamole.tls.certresolver=zero"
+      - "traefik.http.routers.guacamole.entrypoints=https"
+      - "traefik.http.routers.guacamole.middlewares=guacamole-addprefix"
+      - "traefik.http.middlewares.guacamole-addprefix.addprefix.prefix=/guacamole"
+      - "traefik.docker.network=interne"