From e301c5fb782ff2b0ad6b6d9049e5d48f4409f6ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Sep 2022 11:03:51 -0500 Subject: [PATCH 01/10] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f8f5e11..364adb8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-9.0-r2 curl-7.80.0-r3 dbus-libs-1.12.20-r4 encodings-1.0.5-r0 -expat-2.4.7-r0 +expat-2.4.9-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 From b8bd87f0830d57221641de039698e4082fabeeb9 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 4 Oct 2022 16:20:35 -0500 Subject: [PATCH 02/10] Add default_server --- root/defaults/nginx/site-confs/default.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 4171f9d..77e9f23 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -4,8 +4,8 @@ server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; server_name _; From 06f369e0d8e8cf1b411b280a3eb42767f940dba8 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 6 Oct 2022 14:46:20 -0500 Subject: [PATCH 03/10] Update default.conf.sample --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 77e9f23..e52e78c 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; From e19234525a0ef7f22d95fceeaf086616f749c903 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Oct 2022 19:44:06 +0200 Subject: [PATCH 04/10] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 364adb8..2dbda91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 curl-7.80.0-r3 -dbus-libs-1.12.20-r4 +dbus-libs-1.12.24-r0 encodings-1.0.5-r0 expat-2.4.9-r0 fontconfig-2.13.1-r4 From d3858977d760ae3a05a64155b2c7a679b7368e9c Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 07:57:58 -0400 Subject: [PATCH 05/10] Update 50-config --- root/etc/cont-init.d/50-config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index b3935db..44f7b33 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -63,11 +63,10 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" - ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS) sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env + sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi # set appurl From 11d80548501434c545a20a2b994f216effed5df0 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:56:53 -0400 Subject: [PATCH 06/10] Update readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 57fc1d5..5ba4232 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -29,7 +29,7 @@ param_env_vars: - { env_var: "DB_HOST", env_value: "", desc: "for specifying the database host" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } - - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } + - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used (non-alphanumeric passwords must be properly escaped.)" } param_usage_include_ports: true param_ports: From f22489008197ff2740ff8c6474f22a63b53f5a61 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:58:22 -0400 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2aa0dc2..9913a31 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | -| `-e DB_PASS=` | for specifying the database password | +| `-e DB_PASS=` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | From 64446dabf4a29db48bd7681f6f027dedf954740f Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:59:35 -0400 Subject: [PATCH 08/10] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 5ba4232..d91a65d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "14.03.22:", desc: "Add symlinks for theme support." } - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } From 46db2c5bd0868de551505d4d8f69f249c9837ab9 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 10:00:12 -0400 Subject: [PATCH 09/10] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9913a31..e67ff42 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **14.03.22:** - Add symlinks for theme support. * **11.07.21:** - Rebase to Alpine 3.14. From d16c8aab6c453036755da209508e8fb039f5cd1d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 10 Oct 2022 11:27:36 -0500 Subject: [PATCH 10/10] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e67ff42..3da97c9 100644 --- a/README.md +++ b/README.md @@ -158,8 +158,8 @@ Container images are configured using parameters passed at runtime (such as thos | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | -| `-e DB_PASS=` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | -| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | +| `-e DB_PASS=` | for specifying the database password | +| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used (non-alphanumeric passwords must be properly escaped.) | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets)