diff --git a/CHANGELOG.md b/CHANGELOG.md index 70538b7..6b911ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.4.3 2022-06-30 + + ### Added + - Add 'VERSION_SUFFIX' in order to be able to bust client cache for development purposes + + ## 2.4.2 2022-06-28 ### Added diff --git a/Dockerfile b/Dockerfile index c58edb3..04c2dce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -156,6 +156,7 @@ RUN set -x && \ --with-poco-libs=/opt/poco/lib \ --with-app-name="${APP_NAME}" \ --with-vendor="tiredofit@github" \ + ${COOL_CONFIGURE_ARGS} \ && \ #( scripts/locorestrings.py /usr/src/collabora-online /usr/src/libreoffice-core/translations ) && \ make -j$(nproc) && \ diff --git a/README.md b/README.md index 11e166f..9bc5680 100644 --- a/README.md +++ b/README.md @@ -281,25 +281,26 @@ The image comes with English (US, GB, Canada variants) baked into the image, how | `CLEANUP_LIMIT_CPU_PER` | Minimum CPU usage in percent for a document to be candidate for bad state | `85` | #### Other Settings -| Parameter | Description | Default | -| ------------------------------ | ------------------------------------------------------- | --------------- | -| `CHILD_ROOT_PATH` | Child root path | `child-roots` | -| `DOCUMENT_SIGNING_URL` | Endpoint URL of signing server | `` | -| `ENABLE_CAPABILITIES` | Enable Capabilities | `TRUE` | -| `ENABLE_CONFIG_RELOAD` | Enable Reload of coolwsd if config changed in container | `TRUE` | -| `ENABLE_EXPERIMENTAL_FEATURES` | Enable experimental features | `FALSE` | -| `ENABLE_MOUNT_JAIL` | Enable mounting jails | `true` | -| `ENABLE_SECCOMP` | Enable Seccomp | `TRUE` | -| `ENABLE_WEBDAV` | Enable WebDav Storage | `FALSE` | -| `FILE_SERVER_ROOT_PATH` | Path to directory considered as root | `browser/../` | -| `FRAME_ANCESTORS` | Hosts where interface can be hosted in Iframe | `` | -| `HEXIFY_EMBEDDED_URLS` | Hexify Embedded URLS (useful for Azure deployments) | `FALSE` | -| `LOLEAFLET_HTML` | Name of browser.html to use | `loleafet.html` | -| `NETWORK_PROTOCOL` | Network Protocol `ipv4` `ipv6` `all` | `ipv4` | -| `REDLINING_AS_COMMENTS` | Show red-lines as comments | `false` | -| `REMOTE_FONT_URL` | URL to json font lists to load | | -| `SYS_TEMPLATE_PATH` | System Template Path | `systemplate` | -| `USE_INTEGRATOR_THEME` | Use the remote integrators theme | `TRUE` | +| Parameter | Description | Default | +| ------------------------------ | ----------------------------------------------------------------------------------------------------------------- | --------------- | +| `CHILD_ROOT_PATH` | Child root path | `child-roots` | +| `DOCUMENT_SIGNING_URL` | Endpoint URL of signing server | `` | +| `ENABLE_CAPABILITIES` | Enable Capabilities | `TRUE` | +| `ENABLE_CONFIG_RELOAD` | Enable Reload of coolwsd if config changed in container | `TRUE` | +| `ENABLE_EXPERIMENTAL_FEATURES` | Enable experimental features | `FALSE` | +| `ENABLE_MOUNT_JAIL` | Enable mounting jails | `true` | +| `ENABLE_SECCOMP` | Enable Seccomp | `TRUE` | +| `ENABLE_WEBDAV` | Enable WebDav Storage | `FALSE` | +| `FILE_SERVER_ROOT_PATH` | Path to directory considered as root | `browser/../` | +| `FRAME_ANCESTORS` | Hosts where interface can be hosted in Iframe | `` | +| `HEXIFY_EMBEDDED_URLS` | Hexify Embedded URLS (useful for Azure deployments) | `FALSE` | +| `LOLEAFLET_HTML` | Name of browser.html to use | `loleafet.html` | +| `NETWORK_PROTOCOL` | Network Protocol `ipv4` `ipv6` `all` | `ipv4` | +| `REDLINING_AS_COMMENTS` | Show red-lines as comments | `false` | +| `REMOTE_FONT_URL` | URL to json font lists to load | | +| `SYS_TEMPLATE_PATH` | System Template Path | `systemplate` | +| `USE_INTEGRATOR_THEME` | Use the remote integrators theme | `TRUE` | +| `VERSION_SUFFIX` | Append this value onto version to break cache when developing. Generates random uuid when using value of `random` | | #### Adding Custom Fonts diff --git a/install/assets/defaults/10-coolwsd b/install/assets/defaults/10-coolwsd index aa43797..b2b6c5f 100755 --- a/install/assets/defaults/10-coolwsd +++ b/install/assets/defaults/10-coolwsd @@ -79,4 +79,6 @@ TLS_KEY_FILENAME=${TLS_KEY_FILENAME:-"key.pem"} USER_IDLE_TIMEOUT=${USER_IDLE_TIMEOUT:-3600} USER_OUT_OF_FOCUS_TIMEOUT=${USER_OUT_OF_FOCUS_TIMEOUT:-60} USE_INTEGRATOR_THEME=${USE_INTEGRATOR_THEME:-"TRUE"} -WATERMARK_OPACITY=${WATERMARK_OPACITY:-"0.2"} \ No newline at end of file +WATERMARK_OPACITY=${WATERMARK_OPACITY:-"0.2"} + +if [ "${VERSION_SUFFIX,,}" = "random" ] ; then VERSION_SUFFIX="$(cat /proc/sys/kernel/random)" ; fi ; \ No newline at end of file diff --git a/install/etc/cont-init.d/10-coolwsd b/install/etc/cont-init.d/10-coolwsd index 538af55..05f0faf 100755 --- a/install/etc/cont-init.d/10-coolwsd +++ b/install/etc/cont-init.d/10-coolwsd @@ -204,6 +204,7 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then sed -i -e "s|.*<\/max_versions_to_maintain>|${FILES_QUARANTINE_MAX_VERSIONS}<\/max_versions_to_maintain>|" /etc/coolwsd/coolwsd.xml sed -i -e "s|.*<\/expiry_min>|${FILES_QUARANTINE_EXPIRY}<\/expiry_min>|" /etc/coolwsd/coolwsd.xml sed -i -e "s|.*<\/path>|${FILES_QUARANTINE_PATH}<\/path>|" /etc/coolwsd/coolwsd.xml + sed -i -e "s|.*<\/ver_suffix>|${VERSION_SUFFIX}<\/ver_suffix>|" /etc/coolwsd/coolwsd.xml if var_false "${ENABLE_TLS}" ; then sed -i -E "s|.*<\/enable>|false<\/enable>|" /etc/coolwsd/coolwsd.xml