Actualiser docker-compose.yml

docker-compose.yml

@@ -9,10 +9,10 @@ networks:
 #### SERVICES
 services:
 ### guacd
-  guacd:
+  guacamole-guacd:
     container_name: guacamole-guacd
     hostname: guacamole-guacd
-    image: guacamole/guacd:latest
+    image: guacamole/guacd:${GUACAMOLE_VERSION}
     networks:
     - back_network_guacamole
     restart: always
@@ -21,16 +21,16 @@ services:
     - ./record:/var/lib/guacamole/recordings:rw
 
 ### postgres
-  postgres:
+  guacamole-postgres:
     container_name: guacamole-postgres
     hostname: guacamole-postgres
     image: ${POSTGRES_IMAGE_TAG}
     environment:
       PGDATA: ${POSTGRE_DB_DATA}
       POSTGRES_DB: ${POSTGRE_DB_NAME}
-      POSTGRES_PASSWORD: ${POSTGRE_DB_PASSWORD}
+      POSTGRES_PASSWORD: $[POSTGRE_DB_PASSWORD}
       POSTGRES_USER: ${POSTGRE_DB_USER}
-      TZ: Europe/Paris
+      TZ: ${TIMER}
     networks:
     - back_network_guacamole
     healthcheck:
@@ -40,56 +40,59 @@ services:
       retries: 10
     restart: always
     volumes:
-    - ./init:/docker-entrypoint-initdb.d:ro
-    - ./data:/var/lib/postgresql/data:rw
+    - ./init:/docker-entrypoint-initdb.d:z
+    - ./data:/var/lib/postgresql/data:z
 
 ### adminer
-  adminer:
-    container_name: guacamole-adminer
-    hostname: guacamole-adminer
-    depends_on:
-    - postgres
-    image: adminer
-    restart: always
-    networks:
-    - back_network_guacamole
-    - traefik_front_network
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=traefik_front_network"
+#  adminer:
+#    container_name: guacamole-adminer
+#    hostname: guacamole-adminer
+#    depends_on:
+#    - guacamole-postgres
+#    image: adminer
+#    restart: always
+#    networks:
+#    - back_network_guacamole
+#    - traefik_front_network
+#    labels:
+#      - "traefik.enable=true"
+#      - "traefik.docker.network=traefik_front_network"
 # HTTP
-      - "traefik.http.routers.adminer-http.rule=Host(`adminer.tips-of-mine.com`)"
-      - "traefik.http.routers.adminer-http.entrypoints=http"
-      - "traefik.http.routers.adminer-http.priority=49"
+#      - "traefik.http.routers.adminer-http.rule=Host(`adminer.tips-of-mine.com`)"
+#      - "traefik.http.routers.adminer-http.entrypoints=http"
+#      - "traefik.http.routers.adminer-http.priority=49"
 # HTTPS
-      - "traefik.http.routers.adminer-https.rule=Host(`adminer.tips-of-mine.com`)"
-      - "traefik.http.routers.adminer-https.entrypoints=https"
-      - "traefik.http.routers.adminer-https.tls=true"
-      - "traefik.http.routers.adminer-https.priority=50"
-      - "traefik.http.routers.adminer.service=adminer-service"
+#      - "traefik.http.routers.adminer-https.rule=Host(`adminer.tips-of-mine.com`)"
+#      - "traefik.http.routers.adminer-https.entrypoints=https"
+#      - "traefik.http.routers.adminer-https.tls=true"
+#      - "traefik.http.routers.adminer-https.priority=50"
+#      - "traefik.http.routers.adminer.service=adminer-service"
 # Middleware
 # Service
-      - "traefik.http.services.adminer-service.loadbalancer.server.port=8080"
+#      - "traefik.http.services.adminer-service.loadbalancer.server.port=8080"
 
 ### guacamole
   guacamole:
     container_name: guacamole-app
     hostname: guacamole-app
-    image: guacamole/guacamole:latest
+    image: guacamole/guacamole:${GUACAMOLE_VERSION}
+    group_add:
+      - "1000"
     depends_on:
-    - guacd
-    - postgres
+    - guacamole-guacd
+    - guacamole-postgres
     environment:
 ### GUACD
       GUACD_HOME: "/opt/guac_home"
-      GUACD_HOSTNAME: guacd
+      GUACD_HOSTNAME: guacamole-guacd
+      GUACD_PORT: 4822
       RECORDING_SEARCH_PATH: "/var/lib/guacamole/recordings"
 ### PostgreSQL
-      POSTGRES_HOSTNAME: postgres
+      POSTGRESQL_HOSTNAME: guacamole-postgres
       POSTGRESQL_PORT: 5432
-      POSTGRES_DATABASE: guacamole_db
-      POSTGRES_USER: guacamole_user
-      POSTGRES_PASSWORD: 'P@ssword!Here!123456'
+      POSTGRESQL_DATABASE: ${POSTGRE_DB_NAME}
+      POSTGRESQL_USER: ${POSTGRE_DB_USER}
+      POSTGRESQL_PASSWORD: $[POSTGRE_DB_PASSWORD}
 ### Active Directory
 # Controler de domaine
 #      LDAP_HOSTNAME: "10.0.4.4"
@@ -129,7 +132,8 @@ services:
 #      TOTP_PERIOD: 60
 #      TOTP_MODE: sha1
     links:
-    - guacd
+    - guacamole-guacd
+    - guacamole-postgres
     networks:
     - traefik_front_network
     - back_network_guacamole
@@ -140,9 +144,9 @@ services:
 #    - 8080/tcp
     restart: always
     volumes:
-      - ./guacamole-config:/config
-      - ./guac_home:/opt/guac_home
-      - ./record:/var/lib/guacamole/recordings:ro
+      - ./guacamole-config:/config:rw
+      - ./guac_home:/opt/guac_home:rw
+      - ./record:/var/lib/guacamole/recordings:rw
       - ./drive:/drive:rw
     labels:
       - "traefik.enable=true"