From dbc906269f404bbe3a14f36334c20a3524d57417 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 16:59:58 +0200 Subject: [PATCH 01/24] lala --- bookstack/docker-compose.yml | 46 ++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 37f119e..b7d60ed 100644 --- a/bookstack/docker-compose.yml +++ b/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 \ No newline at end of file + restart: unless-stopped + +secrets: + db_password: + file: db_password.txt + db_root_password: + file: db_root_password.txt \ No newline at end of file From 2d0abd073405fd0b1a2a74261c2df3637b6546b2 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:05:06 +0200 Subject: [PATCH 02/24] lala --- bookstack/db_password.txt | 1 + bookstack/db_root_password.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 bookstack/db_password.txt create mode 100644 bookstack/db_root_password.txt diff --git a/bookstack/db_password.txt b/bookstack/db_password.txt new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_password.txt @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password.txt b/bookstack/db_root_password.txt new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_root_password.txt @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file From 7e30c50134463356683cf9d30441231e75fd4a01 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:06:21 +0200 Subject: [PATCH 03/24] lala --- bookstack/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index b7d60ed..71e1559 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: db_password.txt + file: ./db_password.txt db_root_password: - file: db_root_password.txt \ No newline at end of file + file: ./db_root_password.txt \ No newline at end of file From 62a870385e54c4a752342783d18f06259142fa0d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:13:37 +0200 Subject: [PATCH 04/24] lala --- bookstack/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 71e1559..b7d60ed 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: ./db_password.txt + file: db_password.txt db_root_password: - file: ./db_root_password.txt \ No newline at end of file + file: db_root_password.txt \ No newline at end of file From 42dc2af60dc5fbf1bf1aeacd929166d132d778e1 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:18:18 +0200 Subject: [PATCH 05/24] lala --- bookstack/docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index b7d60ed..4d9faf5 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -27,11 +27,11 @@ services: container_name: bookstack_db secrets: - db_password - - db_root_password + environment: PUID: 1000 PGID: 1000 - MYSQL_ROOT_PASSWORD: /run/secrets/db_root_password + MYSQL_ROOT_PASSWORD: /run/secrets/db_password TZ: Europe/London MYSQL_DATABASE: bookstackapp MYSQL_USER: bookstack @@ -44,5 +44,3 @@ services: secrets: db_password: file: db_password.txt - db_root_password: - file: db_root_password.txt \ No newline at end of file From d19f3f25105971d77b4097aa3ec012535fd91b94 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:25:11 +0200 Subject: [PATCH 06/24] lala --- bookstack/db_password.txt | 1 - bookstack/db_root_password.txt | 1 - bookstack/docker-compose.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 bookstack/db_password.txt delete mode 100644 bookstack/db_root_password.txt diff --git a/bookstack/db_password.txt b/bookstack/db_password.txt deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_password.txt +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password.txt b/bookstack/db_root_password.txt deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_root_password.txt +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 4d9faf5..76083d5 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,4 +43,4 @@ services: secrets: db_password: - file: db_password.txt + file: db_password From f248bf6a64d0b5c641b6912b6d30e27452c625ef Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:25:22 +0200 Subject: [PATCH 07/24] lala --- bookstack/db_password | 1 + bookstack/db_root_password | 1 + 2 files changed, 2 insertions(+) create mode 100644 bookstack/db_password create mode 100644 bookstack/db_root_password diff --git a/bookstack/db_password b/bookstack/db_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password b/bookstack/db_root_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_root_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file From d81773f259578a6f4a8b59c6c56c47f7b97f8f3d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:28:32 +0200 Subject: [PATCH 08/24] lala --- bookstack/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 76083d5..aafe8bd 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,4 +43,4 @@ services: secrets: db_password: - file: db_password + file: ./db_password From e74a5caee72ddedd0c048b27db586352c74f7ed5 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:29:12 +0200 Subject: [PATCH 09/24] lala --- bookstack/docker-compose.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index aafe8bd..0ee7804 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -27,11 +27,11 @@ services: container_name: bookstack_db secrets: - db_password - + - db_root_password environment: PUID: 1000 PGID: 1000 - MYSQL_ROOT_PASSWORD: /run/secrets/db_password + MYSQL_ROOT_PASSWORD: /run/secrets/db_root_password TZ: Europe/London MYSQL_DATABASE: bookstackapp MYSQL_USER: bookstack @@ -43,4 +43,6 @@ services: secrets: db_password: - file: ./db_password + file: db_password + db_root_password: + file: db_root_password \ No newline at end of file From 38e5fc976a7520adacb06470d2b26dcbd2b92400 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:31:52 +0200 Subject: [PATCH 10/24] lala --- bookstack/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 0ee7804..6e9e8d7 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: db_password + - file=db_password db_root_password: - file: db_root_password \ No newline at end of file + - file=db_root_password \ No newline at end of file From 6602ad9d183259c5e94422c8fb3b680bb6d8f14f Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:32:52 +0200 Subject: [PATCH 11/24] lala --- bookstack/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index 6e9e8d7..0ee7804 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - - file=db_password + file: db_password db_root_password: - - file=db_root_password \ No newline at end of file + file: db_root_password \ No newline at end of file From 5d01baade0231470fd97a6abb79e72d7098aba54 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:38:38 +0200 Subject: [PATCH 12/24] lala --- bookstack/db_password | 1 - bookstack/db_root_password | 1 - bookstack/docker-compose.yml | 48 ------------------------------------ 3 files changed, 50 deletions(-) delete mode 100644 bookstack/db_password delete mode 100644 bookstack/db_root_password delete mode 100644 bookstack/docker-compose.yml diff --git a/bookstack/db_password b/bookstack/db_password deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password b/bookstack/db_root_password deleted file mode 100644 index 2adc89a..0000000 --- a/bookstack/db_root_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml deleted file mode 100644 index 0ee7804..0000000 --- a/bookstack/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -version: "2" -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: /run/secrets/db_password - DB_DATABASE: bookstackapp - volumes: - - /share/docker_data/bookstrap/bookstack_app_data:/config - ports: - - 6875:80 - restart: unless-stopped - depends_on: - - bookstack_db - 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: /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 - -secrets: - db_password: - file: db_password - db_root_password: - file: db_root_password \ No newline at end of file From 0bde53ddcf5398a5465b9910d4123fbdf0c3dc60 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:38:44 +0200 Subject: [PATCH 13/24] lala --- db_password | 1 + db_root_password | 1 + docker-compose.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 db_password create mode 100644 db_root_password create mode 100644 docker-compose.yml diff --git a/db_password b/db_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/db_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/db_root_password b/db_root_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/db_root_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..0ee7804 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,48 @@ +--- +version: "2" +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: /run/secrets/db_password + DB_DATABASE: bookstackapp + volumes: + - /share/docker_data/bookstrap/bookstack_app_data:/config + ports: + - 6875:80 + restart: unless-stopped + depends_on: + - bookstack_db + 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: /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 + +secrets: + db_password: + file: db_password + db_root_password: + file: db_root_password \ No newline at end of file From 162df9bc7132857860601f9f253b3876ef0fa8aa Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:39:25 +0200 Subject: [PATCH 14/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0ee7804..a1b096a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: db_password + file: ./db_password db_root_password: - file: db_root_password \ No newline at end of file + file: ./db_root_password \ No newline at end of file From f9b9e825a655b3d980a578e949246f089ab268b0 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 17:53:54 +0200 Subject: [PATCH 15/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a1b096a..ba53b74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: ./db_password + file: ~/docker/bookstack/db_password db_root_password: - file: ./db_root_password \ No newline at end of file + file: ~/docker/bookstack/db_root_password \ No newline at end of file From dcfb0164fd5926b5bae2bd0eaf007254b2955a25 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 18:05:43 +0200 Subject: [PATCH 16/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ba53b74..0ee7804 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: ~/docker/bookstack/db_password + file: db_password db_root_password: - file: ~/docker/bookstack/db_root_password \ No newline at end of file + file: db_root_password \ No newline at end of file From e3fa404c1176dfa5a182e8042507abffb2708487 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 18:06:49 +0200 Subject: [PATCH 17/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0ee7804..b82a55b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: db_password + file: "./db_password" db_root_password: - file: db_root_password \ No newline at end of file + file: "./db_root_password" \ No newline at end of file From d3beddf3bac159cbe2505dbba128beefea0d4091 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 18:14:48 +0200 Subject: [PATCH 18/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b82a55b..0ee7804 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: "./db_password" + file: db_password db_root_password: - file: "./db_root_password" \ No newline at end of file + file: db_root_password \ No newline at end of file From 1b8ccc17f2943cdf03a5092b5de0fa6bb32cc36e Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 18:17:39 +0200 Subject: [PATCH 19/24] lala --- docker-compose.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0ee7804..17099e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: bookstack: image: lscr.io/linuxserver/bookstack container_name: bookstack - secrets: - - db_password environment: PUID: 1000 PGID: 1000 @@ -13,7 +11,7 @@ services: DB_HOST: bookstack_db DB_PORT: 3306 DB_USER: bookstack - DB_PASS: /run/secrets/db_password + DB_PASS: l4c1j4yd33Du5lo DB_DATABASE: bookstackapp volumes: - /share/docker_data/bookstrap/bookstack_app_data:/config @@ -25,24 +23,17 @@ 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: /run/secrets/db_root_password + MYSQL_ROOT_PASSWORD: l4c1j4yd33Du5lo TZ: Europe/London MYSQL_DATABASE: bookstackapp MYSQL_USER: bookstack - MYSQL_PASSWORD: /run/secrets/db_password + MYSQL_PASSWORD: l4c1j4yd33Du5lo volumes: - /share/docker_data/bookstrap/bookstack_db_data:/config restart: unless-stopped -secrets: - db_password: - file: db_password - db_root_password: - file: db_root_password \ No newline at end of file From 011df232189ba577d1f728e68d9f6cbba5edf55d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 20:01:11 +0200 Subject: [PATCH 20/24] lala --- docker-compose.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 17099e7..f1a5541 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: bookstack: image: lscr.io/linuxserver/bookstack container_name: bookstack + secrets: + - db_password environment: PUID: 1000 PGID: 1000 @@ -11,7 +13,7 @@ services: DB_HOST: bookstack_db DB_PORT: 3306 DB_USER: bookstack - DB_PASS: l4c1j4yd33Du5lo + DB_PASS: /run/secrets/db_password DB_DATABASE: bookstackapp volumes: - /share/docker_data/bookstrap/bookstack_app_data:/config @@ -23,17 +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 + MYSQL_ROOT_PASSWORD: /run/secrets/db_root_password TZ: Europe/London MYSQL_DATABASE: bookstackapp MYSQL_USER: bookstack - MYSQL_PASSWORD: l4c1j4yd33Du5lo + MYSQL_PASSWORD: /run/secrets/db_password volumes: - /share/docker_data/bookstrap/bookstack_db_data:/config restart: unless-stopped +secrets: + db_password: + file: "/mnt/db_password" + db_root_password: + file: "/mnt/db_root_password" \ No newline at end of file From e966a548ef274096c5846f151c685d414dd42f2c Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 20:09:40 +0200 Subject: [PATCH 21/24] lala --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f1a5541..f9405f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: "/mnt/db_password" + file: "db_password" db_root_password: - file: "/mnt/db_root_password" \ No newline at end of file + file: "db_root_password" \ No newline at end of file From bda73df0e1529aa6c069c60f226d586dfba75d80 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 20:36:49 +0200 Subject: [PATCH 22/24] lala --- db_password | 1 - db_root_password | 1 - docker-compose.yml | 48 ---------------------------------------------- 3 files changed, 50 deletions(-) delete mode 100644 db_password delete mode 100644 db_root_password delete mode 100644 docker-compose.yml diff --git a/db_password b/db_password deleted file mode 100644 index 2adc89a..0000000 --- a/db_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/db_root_password b/db_root_password deleted file mode 100644 index 2adc89a..0000000 --- a/db_root_password +++ /dev/null @@ -1 +0,0 @@ -l4c1j4yd33Du5lo \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index f9405f1..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -version: "2" -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: /run/secrets/db_password - DB_DATABASE: bookstackapp - volumes: - - /share/docker_data/bookstrap/bookstack_app_data:/config - ports: - - 6875:80 - restart: unless-stopped - depends_on: - - bookstack_db - 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: /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 - -secrets: - db_password: - file: "db_password" - db_root_password: - file: "db_root_password" \ No newline at end of file From 7688c9780caf0ef04d8620e6763ac067c2c3f80f Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 20:36:53 +0200 Subject: [PATCH 23/24] lala --- bookstack/db_password | 1 + bookstack/db_root_password | 1 + bookstack/docker-compose.yml | 48 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 bookstack/db_password create mode 100644 bookstack/db_root_password create mode 100644 bookstack/docker-compose.yml diff --git a/bookstack/db_password b/bookstack/db_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/db_root_password b/bookstack/db_root_password new file mode 100644 index 0000000..2adc89a --- /dev/null +++ b/bookstack/db_root_password @@ -0,0 +1 @@ +l4c1j4yd33Du5lo \ No newline at end of file diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml new file mode 100644 index 0000000..f9405f1 --- /dev/null +++ b/bookstack/docker-compose.yml @@ -0,0 +1,48 @@ +--- +version: "2" +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: /run/secrets/db_password + DB_DATABASE: bookstackapp + volumes: + - /share/docker_data/bookstrap/bookstack_app_data:/config + ports: + - 6875:80 + restart: unless-stopped + depends_on: + - bookstack_db + 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: /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 + +secrets: + db_password: + file: "db_password" + db_root_password: + file: "db_root_password" \ No newline at end of file From 5af04014f43e9f38a64784252a47131a5d87e462 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Wed, 13 Sep 2023 20:43:50 +0200 Subject: [PATCH 24/24] lala --- bookstack/docker-compose.yml | 4 ++-- home-assistant/docker-compose.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index f9405f1..96697d7 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -43,6 +43,6 @@ services: secrets: db_password: - file: "db_password" + file: "bookstack/db_password" db_root_password: - file: "db_root_password" \ No newline at end of file + file: "bookstack/db_root_password" \ No newline at end of file diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index 558049f..932d862 100644 --- a/home-assistant/docker-compose.yaml +++ b/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