mirror of
https://github.com/tiredofit/docker-collabora-online.git
synced 2024-06-10 17:52:35 +02:00
Compare commits
42 commits
Author | SHA1 | Date | |
---|---|---|---|
|
0018572076 | ||
|
d45635519b | ||
|
62de89e46c | ||
|
bfd0cae6d1 | ||
|
0f1997b2e0 | ||
|
cca3a97eda | ||
|
1ce3732a09 | ||
|
991a1aefff | ||
|
4f4cf1da29 | ||
|
740468908f | ||
|
37d3de3806 | ||
|
9431c3a4eb | ||
|
b762ac257e | ||
|
51aff14100 | ||
|
bfda53eac3 | ||
|
2086ec9d6a | ||
|
467ffe34de | ||
|
b99db9ac88 | ||
|
704177441c | ||
|
556199751e | ||
|
6f76f2abf9 | ||
|
fe08e28f06 | ||
|
8c1916c0e9 | ||
|
364df2e100 | ||
|
4eea9021bc | ||
|
0d71714834 | ||
|
d197f10ba3 | ||
|
a3b7e75527 | ||
|
1204bb49b2 | ||
|
2edaabadcc | ||
|
f9e596b357 | ||
|
f9419b1ee7 | ||
|
7882c908b4 | ||
|
062310f287 | ||
|
6e2d882863 | ||
|
379d74a05e | ||
|
35ff368880 | ||
|
3de2c8a4b9 | ||
|
5c8eab9f72 | ||
|
a851d189f8 | ||
|
7284208857 | ||
|
01badcdb36 |
246
CHANGELOG.md
246
CHANGELOG.md
|
@ -1,3 +1,249 @@
|
|||
## 24.04.4-1 2024-06-06 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 24.04.4-1
|
||||
- Collabora Online 24.04.4-1
|
||||
|
||||
|
||||
## 24.04.3-2 2024-05-31 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 24.04.3-2
|
||||
- Collabora Office 24.04.3-2
|
||||
|
||||
|
||||
## 24.04.3-1 2024-05-21 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 24.04.3-1
|
||||
- Collabora Office 24.04.3-1
|
||||
|
||||
|
||||
## 24.04.2-1 2024-05-08 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 24.04.2-1
|
||||
- Collabora Online 24.04.2-1
|
||||
|
||||
|
||||
## 24.04.1-4 2024-04-25 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 24.04-1.4
|
||||
- Collabora Office 24.04-1.4
|
||||
|
||||
|
||||
## 24.04.1-2 2024-04-08 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 24.04.1-2
|
||||
- Collabora Online 24.04.1-2
|
||||
|
||||
|
||||
## 23.05.10-1 2024-03-26 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.10-1
|
||||
- Collabora Office 23.05.10-1
|
||||
|
||||
|
||||
## 23.05.9-4 2024-03-10 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.9-4
|
||||
- Collabora Office 23.05.9-4
|
||||
|
||||
|
||||
## 23.05.9-2 2024-02-26 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.9-2
|
||||
- Collabora Office 23.05.9-2
|
||||
|
||||
|
||||
## 23.05.9-1 2024-02-14 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp23.05.9-1
|
||||
- Collabora Online cp23.05.9-1
|
||||
|
||||
|
||||
## 23.05.8-4 2024-02-02 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.8-4
|
||||
- Collabora office 23.05.8-4
|
||||
|
||||
|
||||
## 23.05.8-3 2024-01-31 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.8-3
|
||||
- Collabora Online 23.05.8-3
|
||||
|
||||
|
||||
## 23.05.8-1 2024-01-24 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.8-1
|
||||
- Collabora Online cp-23.05.8-1
|
||||
|
||||
|
||||
## 23.05.7-5 2024-01-19 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp23.05.7-5
|
||||
- Collabora Online cp23.05.7-5
|
||||
|
||||
|
||||
## 23.05.7-4 2024-01-18 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.7-4
|
||||
- Collabora Office 23.05.7-4
|
||||
|
||||
|
||||
## 23.05.7-3 2024-01-17 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.7-3
|
||||
- Collabora Online 23.05.7-3
|
||||
|
||||
|
||||
## 23.05.7-2 2024-01-11 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.7-2
|
||||
- Collabora Office cp-23.05.7-2
|
||||
|
||||
|
||||
## 23.05.7-1 2024-01-10 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.7-1
|
||||
- Collabora Office cp-23.05.7-1
|
||||
|
||||
|
||||
## 23.05.6-4 2023-12-19 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.6-4
|
||||
- Collabora Online 23.05.6-4
|
||||
|
||||
|
||||
## 23.05.6-3 2023-12-14 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.6-3
|
||||
- Collabora Online 23.05.6-3
|
||||
|
||||
|
||||
## 23.05.6-2 2023-12-05 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.6-2
|
||||
- Collabora Office cp-23.05.6-2
|
||||
|
||||
|
||||
## 23.05.6-1 2023-12-04 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.6.1
|
||||
- Collabora Office 23.05.6.1
|
||||
|
||||
|
||||
## 23.05.5-4 2023-11-10 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.5-4
|
||||
- Collabora Office cp-23.05.5-4
|
||||
|
||||
|
||||
## 23.05.5-3 2023-10-26 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.5-3
|
||||
- Collabora Office cp-23.05.5-3
|
||||
- Poco 1.12.5
|
||||
|
||||
|
||||
## 23.05.5-2 2023-10-19 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.5-2
|
||||
- Collabora Online cp-23.05.5-2
|
||||
|
||||
|
||||
## 23.05.5-1 2023-10-11 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online cp-23.05.5-1
|
||||
- Collabora Office cp-23.05.5-1
|
||||
|
||||
|
||||
## 23.05.4-2 2023-09-19 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.4-2
|
||||
- Collabora Online cp-23.05.4-2
|
||||
|
||||
|
||||
## 23.05.4-1 2023-09-11 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.4-1
|
||||
- Collabora Online cp-23.05.4-1
|
||||
|
||||
|
||||
## 23.05.3-1 2023-08-28 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.3-1
|
||||
- Collabora Online 23.05.3-1
|
||||
|
||||
|
||||
## 23.05.2-2.1 2023-07-25 <dave at tiredofit dot ca>
|
||||
|
||||
### Changed
|
||||
- Fix small issue with sed statement for DeepL
|
||||
- Run fontconfig under cool user
|
||||
|
||||
|
||||
## 23.05.2-2 2023-07-24 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.2-2
|
||||
- Collabora Office 23.05.2-2
|
||||
|
||||
|
||||
## 23.05.2-1 2023-07-20 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office 23.05.2-1
|
||||
- Collabora Online 23.05.2-1
|
||||
|
||||
|
||||
## 23.05.1-2 2023-06-26 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.1-2
|
||||
- Collabora Online cp-23.05.1-2
|
||||
|
||||
|
||||
## 23.05.1-1 2023-06-23 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Office cp-23.05.1-1
|
||||
- Collabora Online cp-23.05.1-1
|
||||
|
||||
|
||||
## 23.05.0-5 2023-06-12 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
- Collabora Online 23.05.0-5
|
||||
- Collaobra Office 23.05.0-5
|
||||
|
||||
|
||||
## 23.05.0-4 2023-06-09 <dave at tiredofit dot ca>
|
||||
|
||||
### Added
|
||||
|
|
17
Dockerfile
17
Dockerfile
|
@ -1,4 +1,4 @@
|
|||
FROM docker.io/tiredofit/debian:bullseye as builder
|
||||
FROM docker.io/tiredofit/debian:bookworm as builder
|
||||
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
||||
LABEL org.opencontainers.image.source="https://github.com/tiredofit/docker-collabora-online"
|
||||
|
||||
|
@ -13,16 +13,16 @@ ARG APP_NAME
|
|||
ARG APP_BRAND
|
||||
|
||||
### Environment Variables
|
||||
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-23.05.0-4"} \
|
||||
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-24.04.4-1"} \
|
||||
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
|
||||
#
|
||||
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-23.05.0-4"} \
|
||||
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-24.04.4-1"} \
|
||||
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
|
||||
#
|
||||
APP_NAME=${APP_NAME:-"Document Editor"} \
|
||||
APP_BRAND=${APP_BRAND:-"unbranded"} \
|
||||
#
|
||||
POCO_VERSION=${POCO_VERSION:-"poco-1.12.4-release.tar.gz"} \
|
||||
POCO_VERSION=${POCO_VERSION:-"poco-1.13.3-release.tar.gz"} \
|
||||
POCO_URL=${POCO_URL:-"https://github.com/pocoproject/poco/archive/"} \
|
||||
#
|
||||
MAX_CONNECTIONS=${MAX_CONNECTIONS:-"100000"} \
|
||||
|
@ -33,11 +33,10 @@ COPY build-assets /build-assets
|
|||
|
||||
RUN source /assets/functions/00-container && \
|
||||
set -x && \
|
||||
package update && \
|
||||
apt-get -o Dpkg::Options::="--force-confold" upgrade -y && \
|
||||
echo "deb-src http://deb.debian.org/debian $(cat /etc/os-release |grep "VERSION=" | awk 'NR>1{print $1}' RS='(' FS=')') main" >> /etc/apt/sources.list && \
|
||||
echo "deb http://deb.debian.org/debian $(cat /etc/os-release |grep "VERSION=" | awk 'NR>1{print $1}' RS='(' FS=')') contrib" >> /etc/apt/sources.list && \
|
||||
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
|
||||
package update && \
|
||||
apt-get -o Dpkg::Options::="--force-confold" upgrade -y && \
|
||||
\
|
||||
### Setup Distribution
|
||||
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
||||
|
@ -77,11 +76,13 @@ RUN source /assets/functions/00-container && \
|
|||
m4 \
|
||||
nasm \
|
||||
nodejs \
|
||||
npm \
|
||||
openssl \
|
||||
pkg-config \
|
||||
procps \
|
||||
python3-lxml \
|
||||
python3-polib \
|
||||
rsync \
|
||||
sudo \
|
||||
translate-toolkit \
|
||||
ttf-mscorefonts-installer \
|
||||
|
@ -180,7 +181,7 @@ RUN source /assets/functions/00-container && \
|
|||
/usr/src/* \
|
||||
/var/log/*
|
||||
|
||||
FROM docker.io/tiredofit/debian:bullseye
|
||||
FROM docker.io/tiredofit/debian:bookworm
|
||||
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
||||
LABEL org.opencontainers.image.source="https://github.com/tiredofit/docker-collabora-online"
|
||||
|
||||
|
|
26
README.md
26
README.md
|
@ -41,6 +41,7 @@ This will build a Docker image for [Collabora Online](https://www.collaboraoffic
|
|||
- [General Usage](#general-usage)
|
||||
- [Administration](#administration)
|
||||
- [Logging](#logging)
|
||||
- [Language](#languages-for-writing-aids-spell-checker-grammar-checker-thesaurus-hyphenation)
|
||||
- [Spell Check](#spell-check)
|
||||
- [TLS Settings](#tls-settings)
|
||||
- [Performance and Limits](#performance-and-limits)
|
||||
|
@ -86,8 +87,9 @@ The following image tags are available along with their tagged release based on
|
|||
|
||||
| Collabora Office version | Collabora Online version | Tag |
|
||||
| ------------------------ | ------------------------ | ---------- |
|
||||
| `2024` | `24.04.x` | `24.04.xx` |
|
||||
| `2024` | `24.04.x` | `latest` |
|
||||
| `2023` | `23.05.x` | `23.05.xx` |
|
||||
| `2023` | `23.05.x` | `latest` |
|
||||
| `2022` | `22.05.x` | `2.4.0` |
|
||||
| `2021` | `21.11.0` | `2.3.0` |
|
||||
| `6.4.x` | `6.4.x` | `2.1` |
|
||||
|
@ -101,8 +103,8 @@ Images are built primarily for `amd64` architecture, and may also include builds
|
|||
## Configuration
|
||||
### Quick Start
|
||||
|
||||
* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/compose.yml) that can be modified for development or production use.
|
||||
* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `docker-compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
|
||||
* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [compose.yml](examples/compose.yml) that can be modified for development or production use.
|
||||
* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
|
||||
* Map [persistent storage](#data-volumes) for access to configuration and data files for backup.
|
||||
* Make sure you set your hostname e.g. online.example.com when starting your container to make sure the administration console urls are correct.
|
||||
|
||||
|
@ -174,6 +176,23 @@ Be sure to view the following repositories to understand all the customizable op
|
|||
| `LOG_LIBREOFFICE` | Log filter what Libreoffice entries | `-INFO-WARN` |
|
||||
| `LOG_PROTOCOL` | Log Client Server Protocol | `false` |
|
||||
|
||||
#### Languages for writing aids (spell checker, grammar checker, thesaurus, hyphenation)
|
||||
|
||||
The image comes with English (US, GB variants) baked into the image, however upon container startup you can add more languages via environment variables.
|
||||
Add multiple languages by seperating with a space.
|
||||
|
||||
| Parameter | Value | Description |
|
||||
| -------------- | ------- | -------------------------- |
|
||||
| `LANGUAGE` | `en_GB` | English (Great Britain) |
|
||||
| | `en_US` | English (US) |
|
||||
| | `fr_FR` | French (France) |
|
||||
|
||||
The above table is just a sample of valid values.
|
||||
|
||||
Please note that allowing too many has negative effect on startup performance.
|
||||
|
||||
Default value: `en_GB en_US`
|
||||
|
||||
#### Spell Check
|
||||
|
||||
The image comes with English (US, GB, Canada variants) baked into the image, however upon container startup you can add more spell check variants via environment variables. Add multiple dictionaries by seperating with a comma.
|
||||
|
@ -225,6 +244,7 @@ The image comes with English (US, GB, Canada variants) baked into the image, how
|
|||
| | `uk` | Ukranian |
|
||||
| | `vi` | Vietnamese |
|
||||
|
||||
Don’t forget to add the according languages to the [`LANGUAGE`](#languages-for-writing-aids-spell-checker-grammar-checker-thesaurus-hyphenation) environment variable.
|
||||
|
||||
#### TLS Settings
|
||||
| Parameter | Description | Default |
|
||||
|
|
|
@ -78,6 +78,7 @@ if [ -d /assets/custom-fonts/ ] ; then
|
|||
chmod +rx /assets/custom-fonts
|
||||
ln -s /assets/custom-fonts /usr/share/fonts/truetype/custom
|
||||
silent fc-cache -f -v
|
||||
silent sudo -i cool fc-cache -f -v
|
||||
rm -rf /opt/cool/systemplate/*
|
||||
silent sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice
|
||||
fi
|
||||
|
@ -128,18 +129,18 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
|
|||
## Language Tool
|
||||
sed -i \
|
||||
-e "s|<enabled desc=\"Enable Remote Spell and Grammar Checker\"\(.*\)>.*</enabled>|<enabled desc=\"Enable Remote Spell and Grammar Checker\"\1>${ENABLE_LANGUAGE_TOOL,,}</enabled>|g" \
|
||||
-e "s|<base_url desc=\"Http endpoint for the API server\(.*\)>.*<\/base_url>|<base_url desc=\"Http endpointfor the API server\1>${LANGUAGE_TOOL_BASE_URL}<\/base_url>|" \
|
||||
-e "s|<user_name desc=\"Lan\(.*\)>.*<\/user_name>|<user_name desc=\"Lan\1>${LANGUAGE_TOOL_USER_NAME}<\/user_name>|" \
|
||||
-e "s|<api_key desc=\"API key provided by Lan\(.*\)>.*<\/api_key>|<api_key desc=\"API key provided by Lan\1>${LANGUAGE_TOOL_API_KEY}<\/api_key>|" \
|
||||
-e "s|<ssl_verification desc=\"Enable or disable SSL\(.*\)>.*<\/ssl_verification>|<ssl_verification desc=\"Enable or disable SSL\1>${LANGUAGE_TOOL_SSL_VERIFY,,}<\/ssl_verification>|" \
|
||||
-e "s|<rest_protocol desc=\"REST API protocol\(.*\)>.*<\/rest_protocol>|<rest_protocol desc=\"REST API protocol\1>${LANGUAGE_TOOL_REST_PROTOCOL,,}<\/rest_protocol>|" \
|
||||
-e "s|<base_url desc=\"Http endpoint for the API server\(.*\)>.*<\/base_url>|<base_url desc=\"Http endpointfor the API server\1>${LANGUAGE_TOOL_BASE_URL}<\/base_url>|g" \
|
||||
-e "s|<user_name desc=\"Lan\(.*\)>.*<\/user_name>|<user_name desc=\"Lan\1>${LANGUAGE_TOOL_USER_NAME}<\/user_name>|g" \
|
||||
-e "s|<api_key desc=\"API key provided by Lan\(.*\)>.*<\/api_key>|<api_key desc=\"API key provided by Lan\1>${LANGUAGE_TOOL_API_KEY}<\/api_key>|g" \
|
||||
-e "s|<ssl_verification desc=\"Enable or disable SSL\(.*\)>.*<\/ssl_verification>|<ssl_verification desc=\"Enable or disable SSL\1>${LANGUAGE_TOOL_SSL_VERIFY,,}<\/ssl_verification>|g" \
|
||||
-e "s|<rest_protocol desc=\"REST API protocol\(.*\)>.*<\/rest_protocol>|<rest_protocol desc=\"REST API protocol\1>${LANGUAGE_TOOL_REST_PROTOCOL,,}<\/rest_protocol>|g" \
|
||||
/etc/coolwsd/coolwsd.xml
|
||||
|
||||
## DeepL
|
||||
sed -i \
|
||||
-e "s|<enabled desc=\"If true, shows translate option as a menu\(.*\)>.*</enabled>|<enabled desc=\"If true, shows translate option as a menu\1>${ENABLE_DEEPL,,}</enabled>|g" \
|
||||
-e "s|<api_url desc=\"URL for the API\"\(.*\)>.*<\/api_url>|<api_url desc=\"URL for the API\"\1>${DEEPL_API_URL}<\/api_url>|" \
|
||||
-e "s|<auth_key desc=\"Auth Key generated by your account\"(.*\)>.*<\/auth_key>|<auth_key desc="Auth Key generated by your account"\1>${DEEPL_AUTH_KEY}<\/auth_key>|g" \
|
||||
-e "s|<api_url desc=\"URL for the API\"\(.*\)>.*<\/api_url>|<api_url desc=\"URL for the API\"\1>${DEEPL_API_URL}<\/api_url>|g" \
|
||||
-e "s|<auth_key desc=\"Auth Key generated by your account\"\(.*\)>.*<\/auth_key>|<auth_key desc=\"Auth Key generated by your account\"\1>${DEEPL_AUTH_KEY}<\/auth_key>|g" \
|
||||
/etc/coolwsd/coolwsd.xml
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue