Merge branch 'master' into 3.17

Author: thespad

README.md

@@ -80,8 +80,8 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Etc/UTC
-      - CONTEXT_PATH=url-base
+      - TZ=Europe/London
+      - CONTEXT_PATH=url-base #optional
     volumes:
       - /path/to/appdata/config:/config
       - /path/to/audiobooks:/audiobooks
@@ -100,7 +100,7 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -e CONTEXT_PATH=url-base \
+  -e CONTEXT_PATH=url-base `#optional` \
   -p 4040:4040 \
   -v /path/to/appdata/config:/config \
   -v /path/to/audiobooks:/audiobooks \

package_versions.txt

@@ -9,7 +9,7 @@ busybox-1.34.1-r7
 ca-certificates-20220614-r0
 ca-certificates-bundle-20220614-r0
 coreutils-9.0-r2
-curl-7.80.0-r4
+curl-7.80.0-r5
 encodings-1.0.5-r0
 expat-2.5.0-r0
 ffmpeg-4.4.1-r2
@@ -40,7 +40,7 @@ libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcom_err-1.46.4-r0
 libcrypto1.1-1.1.1s-r1
-libcurl-7.80.0-r4
+libcurl-7.80.0-r5
 libdav1d-0.9.2-r0
 libdrm-2.4.109-r0
 libffi-3.4.2-r1

readme-vars.yml

@@ -26,7 +26,6 @@ param_container_name: "{{ project_name }}"
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
-  - { env_var: "CONTEXT_PATH", env_value: "url-base", desc: "Base url for use with reverse proxies etc." }
 param_usage_include_vols: true
 param_volumes:
   - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." }
@@ -37,6 +36,10 @@ param_usage_include_ports: true
 param_ports:
   - { external_port: "4040", internal_port: "4040", port_desc: "Application WebUI" }
 
+# optional container parameters
+opt_param_usage_include_env: true
+opt_param_env_vars:
+  - { env_var: "CONTEXT_PATH", env_value: "url-base", desc: "Base url for use with reverse proxies etc." }
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: "Whilst this is a more up to date rebase of the original Booksonic server, upgrading in place is not supported and a fresh install has been recommended. Default user/pass is admin/admin"