diff --git a/CHANGELOG.md b/CHANGELOG.md index 004174a..28e1b26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.1 2019-07-07 + +* Add `EXTRA_OPTIONS` variable + ## 1.3 2019-05-08 * Collabora Office 6.0.30 diff --git a/Dockerfile b/Dockerfile index 807791c..85b7506 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN set -x && \ chown lool:lool /home/lool -R && \ \ ## Add Build Dependencies + apt-get upgrade -y && \ apt-get install -y \ cpio \ git \ diff --git a/README.md b/README.md index 4fcafd0..cf88831 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ Along with the Environment Variables from the [Base image](https://hub.docker.co | `ALLOWED_HOSTS` | Set which domains which can access service - Example: `^(.*)\.example\.org` | | `DICTIONARIES` | Spell Check Languages - Available `en_GB en_US` - Default `en_GB en_US` | | `LOG_LEVEL` | Log Level - Available `none, fatal, critical, error, warning, notice, information, debug, trace` - Default `warning` | +| `EXTRA_OPTIONS` | If you want to pass additional arguments upon startup, add it here | ### Networking diff --git a/install/etc/s6/services/10-loolwsd/run b/install/etc/s6/services/10-loolwsd/run index 65d1756..ce1c199 100755 --- a/install/etc/s6/services/10-loolwsd/run +++ b/install/etc/s6/services/10-loolwsd/run @@ -11,4 +11,4 @@ fi echo '**' echo '** [libreoffice-online] Starting Libreoffice Online Web Services daemon' -exec s6-setuidgid lool /opt/lool/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/jails --o:file_server_root_path=/opt/lool/share/loolwsd storage.filesystem[@allow]=true --o:admin_console.username=${ADMIN_USER} --o:admin_console.password=${ADMIN_PASS} >> /var/log/lool/loolwsd.log +exec s6-setuidgid lool /opt/lool/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/jails --o:file_server_root_path=/opt/lool/share/loolwsd storage.filesystem[@allow]=true --o:admin_console.username=${ADMIN_USER} --o:admin_console.password=${ADMIN_PASS} ${EXTRA_OPTIONS} >> /var/log/lool/loolwsd.log