mirror of
https://github.com/tiredofit/docker-collabora-online.git
synced 2024-05-20 15:06:33 +02:00
Release 2.4.1 - See CHANGELOG.md
This commit is contained in:
parent
a13a75ca90
commit
a05b39e38b
|
|
@ -1,3 +1,9 @@
|
|||
## 2.4.1 2022-04-12 <dave at tiredofit dot ca>
|
||||
|
||||
### Changed
|
||||
- Cleanup some old unused lines and code
|
||||
|
||||
|
||||
## 2.4.0 2022-04-07 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
|
|
|
|||
|
|
@ -257,7 +257,7 @@ RUN set -x && \
|
|||
### Setup LibreOffice Online Jails
|
||||
sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice && \
|
||||
\
|
||||
if [ -d "/build-assets/container/src" ] ; then cp -R /build-assets/container/src/* /usr/src/libreoffice-container ; fi; \
|
||||
if [ -d "/build-assets/container/src" ] ; then cp -R /build-assets/container/src/* / ; fi; \
|
||||
if [ -d "/build-assets/container/scripts" ] ; then for script in /build-assets/container/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; fi ; \
|
||||
apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
|
|
|
|||
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2021 Dave Conroy
|
||||
Copyright (c) 2022 Dave Conroy
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
28
README.md
28
README.md
|
|
@ -68,7 +68,7 @@ This will build a Docker image for [Collabora Online](https://www.collaboraoffic
|
|||
### Build from Source
|
||||
- Clone this repository and build the image with `docker build <arguments> (imagename) .`
|
||||
|
||||
- If you decide to compile this, it will take quite a few hours even on the fastest computer due to the amount of data required to download to compile. At some stages this image will grow to 30GB before sheeding most of it for it's final size.
|
||||
- If you decide to compile this, it will take quite a few hours even on the fastest computer due to the amount of data required to download to compile. At some stages this image will grow to 30GB before shedding most of it for it's final size.
|
||||
|
||||
|
||||
### Prebuilt Images
|
||||
|
|
@ -78,7 +78,7 @@ Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tired
|
|||
docker pull tiredofit/collabora-online:(imagetag)
|
||||
```
|
||||
|
||||
The following image tags are available along with their taged release based on what's written in the [Changelog](CHANGELOG.md):
|
||||
The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
|
||||
|
||||
| LibreOffice version | Collabora Online version | Tag |
|
||||
| ------------------- | ------------------------ | -------- |
|
||||
|
|
@ -126,17 +126,17 @@ Be sure to view the following repositories to understand all the customizable op
|
|||
| [OS Base](https://github.com/tiredofit/docker-debian/) | Customized Image based on Debian Linux |
|
||||
|
||||
#### General Usage
|
||||
| Parameter | Description | Default |
|
||||
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------ | --------- |
|
||||
| `SETUP_TYPE` | Automatically generate configuration with defaults. Set to `MANUAL` and map the configuration file to use your own | `AUTO` |
|
||||
| `ALLOWED_HOSTS` | Set which domains which can access service Seperate Multiple with `,` - Example: `^(.*)\.example\.org` | `` |
|
||||
| `EXTRA_OPTIONS` | If you want to pass additional arguments upon startup, add it here | `` |
|
||||
| `INTERFACE` | Web interface type `classic` or `notebookbar` | `classic` |
|
||||
| `WATERMARK_OPACITY` | Watermark Opacity | `0.2` |
|
||||
| `WATERMARK_TEXT` | Text to display for watermark | `` |
|
||||
| `ENABLE_MACROS` | Enable Macros | `FALSE` |
|
||||
| `MACRO_SECURITY_LEVEL` | Macro Security Level `1` Medium `0` Low | `1` |
|
||||
| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics | `FALSE` |
|
||||
| Parameter | Description | Default |
|
||||
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------- |
|
||||
| `SETUP_TYPE` | Automatically generate configuration with defaults. Set to `MANUAL` and map the configuration file to use your own | `AUTO` |
|
||||
| `ALLOWED_HOSTS` | Set which domains which can access service Seperate Multiple with `,` - Example: `https://www.example\.org` | `` |
|
||||
| `EXTRA_OPTIONS` | If you want to pass additional arguments upon startup, add it here | `` |
|
||||
| `INTERFACE` | Web interface type `classic` or `notebookbar` | `notebookbar` |
|
||||
| `WATERMARK_OPACITY` | Watermark Opacity | `0.2` |
|
||||
| `WATERMARK_TEXT` | Text to display for watermark | `` |
|
||||
| `ENABLE_MACROS` | Enable Macros | `FALSE` |
|
||||
| `MACRO_SECURITY_LEVEL` | Macro Security Level `1` Medium `0` Low | `1` |
|
||||
| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics | `FALSE` |
|
||||
|
||||
|
||||
#### Administration
|
||||
|
|
@ -268,7 +268,7 @@ The image comes with English (US, GB, Canada variants) baked into the image, how
|
|||
| `NETWORK_PROTOCOL` | Network Protocol `ipv4` `ipv6` `all` | `ipv4` |
|
||||
| `ENABLE_WEBDAV` | Enable WebDav Storage | `FALSE` |
|
||||
| `FILE_SERVER_ROOT_PATH` | Path to directory considered as root | `browser/../` |
|
||||
| `FRAME_ANCESTORS` | Hosts where interface van be hosted in Iframe | `` |
|
||||
| `FRAME_ANCESTORS` | Hosts where interface can be hosted in Iframe | `` |
|
||||
| `ENABLE_MOUNT_JAIL` | Enable mounting jails | `true` |
|
||||
| `CHILD_ROOT_PATH` | Child root path | `child-roots` |
|
||||
| `SYS_TEMPLATE_PATH` | System Template Path | `systemplate` |
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ if var_true "${ENABLE_TLS}" ; then
|
|||
else
|
||||
if [ ! -f "${TLS_CERT_PATH}"/"${TLS_KEY_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}"/"${TLS_CA_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}"/"${TLS_CERT_FILENAME}" ] ; then
|
||||
print_error "TLS Certificates missing... Please switch to autogenerate mode, or place your certifcates in the correct location."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -167,7 +168,6 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
|
|||
sed -i -e "s|<browser_logging \(.*\)>.*<\/browser_logging>|<browser_logging \1>${LOG_CLIENT_CONSOLE}<\/browser_logging>|" /etc/coolwsd/coolwsd.xml
|
||||
sed -i -e "s|<proto \(.*\)>.*<\/proto>|<proto \1>${NETWORK_PROTOCOL}<\/proto>|" /etc/coolwsd/coolwsd.xml
|
||||
sed -i -e "s|<frame_ancestors \(.*\)>.*<\/frame_ancestors>|<frame_ancestors \1>${FRAME_ANCESTORS}<\/frame_ancestors>|" /etc/coolwsd/coolwsd.xml
|
||||
#sed -i -e "s|localhost<\/host>|${ALLOWED_HOSTS}<\/host>|" /etc/coolwsd/coolwsd.xml
|
||||
sed -i -e "s|<connection_timeout \(.*\)>.*<\/connection_timeout>|<connection_timeout \1>${CONNECTION_TIMEOUT}<\/connection_timeout>|" /etc/coolwsd/coolwsd.xml
|
||||
sed -i -e "s|<ca_file_path \(.*\) relative=\"false\">.*<\/ca_file_path>|<ca_file_path \1 relative=\"false\">${TLS_CERT_PATH}/${TLS_CA_FILENAME}<\/ca_file_path>|" /etc/coolwsd/coolwsd.xml
|
||||
sed -i -e "s|<cert_file_path \(.*\) relative=\"false\">.*<\/cert_file_path>|<cert_file_path \1 relative=\"false\">${TLS_CERT_PATH}/${TLS_CERT_FILENAME}<\/cert_file_path>|" /etc/coolwsd/coolwsd.xml
|
||||
|
|
|
|||
Loading…
Reference in a new issue