Merge branch 'main' of https://gitlab.sectorq.eu/home/docker-compose

bookstack/db_password

@@ -0,0 +1 @@
+l4c1j4yd33Du5lo

bookstack/db_root_password

@@ -0,0 +1 @@
+l4c1j4yd33Du5lo

bookstack/docker-compose.yml

@@ -4,17 +4,17 @@ services:
   bookstack:
     image: lscr.io/linuxserver/bookstack
     container_name: bookstack
+    secrets:
+       - db_password
     environment:
-      - PUID=1000
-      - PGID=1000
-      - APP_URL=http://192.168.77.106:6875
-      - DB_HOST=bookstack_db
-      - DB_PORT=3306
-      - DB_USER=bookstack
-      - DB_PASS=l4c1j4yd33Du5lo
-      - DB_DATABASE=bookstackapp
-
-      
+      PUID: 1000
+      PGID: 1000
+      APP_URL: http://192.168.77.106:6875
+      DB_HOST: bookstack_db
+      DB_PORT: 3306
+      DB_USER: bookstack
+      DB_PASS: /run/secrets/db_password
+      DB_DATABASE: bookstackapp
     volumes:
       - /share/docker_data/bookstrap/bookstack_app_data:/config
     ports:
@@ -25,14 +25,24 @@ services:
   bookstack_db:
     image: lscr.io/linuxserver/mariadb
     container_name: bookstack_db
+    secrets:
+       - db_password
+       - db_root_password
     environment:
-      - PUID=1000
-      - PGID=1000
-      - MYSQL_ROOT_PASSWORD=l4c1j4yd33Du5lo
-      - TZ=Europe/London
-      - MYSQL_DATABASE=bookstackapp
-      - MYSQL_USER=bookstack
-      - MYSQL_PASSWORD=l4c1j4yd33Du5lo
+      PUID: 1000
+      PGID: 1000
+      MYSQL_ROOT_PASSWORD: /run/secrets/db_root_password
+      TZ: Europe/London
+      MYSQL_DATABASE: bookstackapp
+      MYSQL_USER: bookstack
+      MYSQL_PASSWORD: /run/secrets/db_password
+    
     volumes:
       - /share/docker_data/bookstrap/bookstack_db_data:/config
-    restart: unless-stopped
+    restart: unless-stopped
+
+secrets:
+  db_password:
+    file: "bookstack/db_password"
+  db_root_password:
+    file: "bookstack/db_root_password"

home-assistant/docker-compose.yaml

@@ -9,7 +9,6 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /dev/ttyUSB0:/dev/ttyUSB0 
       - /var/log:/logging
-
       - /var/run/docker.sock:/var/run/docker.sock
     privileged: true