Compare commits

...

51 commits
2.4.31 ... main

Author SHA1 Message Date
dave@tiredofit.ca 0018572076 Release 24.04.4-1 - See CHANGELOG.md 2024-06-06 08:01:40 -07:00
dave@tiredofit.ca d45635519b Release 24.04.3-2 - See CHANGELOG.md 2024-05-31 12:01:25 -07:00
dave@tiredofit.ca 62de89e46c Release 24.04.3-1 - See CHANGELOG.md 2024-05-21 09:20:16 -07:00
dave@tiredofit.ca bfd0cae6d1 Release 24.04.2-1 - See CHANGELOG.md 2024-05-08 13:24:16 -07:00
dave@tiredofit.ca 0f1997b2e0 Release 24.04.1-4 - See CHANGELOG.md 2024-04-25 08:53:15 -07:00
dave@tiredofit.ca cca3a97eda Release 24.04.1-2 - See CHANGELOG.md 2024-04-08 09:51:04 -07:00
Dave Conroy 1ce3732a09 Poco 1.13.3 2024-04-05 08:34:36 -07:00
dave@tiredofit.ca 991a1aefff Release 23.05.10-1 - See CHANGELOG.md 2024-03-26 14:49:54 -07:00
dave@tiredofit.ca 4f4cf1da29 Release 23.05.9-4 - See CHANGELOG.md 2024-03-10 08:38:36 -07:00
dave@tiredofit.ca 740468908f Release 23.05.9-2 - See CHANGELOG.md 2024-02-26 08:36:48 -08:00
dave@tiredofit.ca 37d3de3806 Release 23.05.9-1 - See CHANGELOG.md 2024-02-14 08:12:56 -08:00
dave@tiredofit.ca 9431c3a4eb Release 23.05.8-4 - See CHANGELOG.md 2024-02-02 09:02:59 -08:00
dave@tiredofit.ca b762ac257e Release 23.05.8-3 - See CHANGELOG.md 2024-01-31 20:29:29 -08:00
dave@tiredofit.ca 51aff14100 Release 23.05.8-1 - See CHANGELOG.md 2024-01-24 22:38:08 -08:00
dave@tiredofit.ca bfda53eac3 Release 23.05.7-5 - See CHANGELOG.md 2024-01-19 09:13:58 -08:00
dave@tiredofit.ca 2086ec9d6a Release 23.05.7-4 - See CHANGELOG.md 2024-01-18 13:40:56 -08:00
dave@tiredofit.ca 467ffe34de Release 23.05.7-3 - See CHANGELOG.md 2024-01-17 13:12:13 -08:00
dave@tiredofit.ca b99db9ac88 Release 23.05.7-2 - See CHANGELOG.md 2024-01-11 09:11:18 -08:00
dave@tiredofit.ca 704177441c Release 23.05.7-1 - See CHANGELOG.md 2024-01-10 11:50:50 -08:00
dave@tiredofit.ca 556199751e Release 23.05.6-4 - See CHANGELOG.md 2023-12-19 11:28:02 -08:00
dave@tiredofit.ca 6f76f2abf9 Release 23.05.6-3 - See CHANGELOG.md 2023-12-14 08:38:37 -08:00
dave@tiredofit.ca fe08e28f06 Release 23.05.6-2 - See CHANGELOG.md 2023-12-05 09:09:11 -08:00
Dave Conroy 8c1916c0e9 Poco 1.12.5p2 2023-12-04 11:58:33 -08:00
dave@tiredofit.ca 364df2e100 Release 23.05.6-1 - See CHANGELOG.md 2023-12-04 08:35:24 -08:00
dave@tiredofit.ca 4eea9021bc Release 23.05.5-4 - See CHANGELOG.md 2023-11-10 10:05:12 -08:00
Dave Conroy 0d71714834 Update poco to 1.25.1p1 2023-11-02 10:56:37 -07:00
dave@tiredofit.ca d197f10ba3 Release 23.05.5-3 - See CHANGELOG.md 2023-10-26 14:21:56 -07:00
dave@tiredofit.ca a3b7e75527 Release 23.05.5-2 - See CHANGELOG.md 2023-10-19 08:00:23 -07:00
dave@tiredofit.ca 1204bb49b2 Release 23.05.5-1 - See CHANGELOG.md 2023-10-11 12:12:35 -07:00
dave@tiredofit.ca 2edaabadcc Release 23.05.4-2 - See CHANGELOG.md 2023-09-19 14:08:42 -07:00
dave@tiredofit.ca f9e596b357 Release 23.05.4-1 - See CHANGELOG.md 2023-09-11 14:46:05 -07:00
dave@tiredofit.ca f9419b1ee7 Release 23.05.3-1 - See CHANGELOG.md 2023-08-28 14:39:52 -07:00
Dave Conroy 7882c908b4
Merge pull request #35 from framasoft/fix-language-doc
📝 — Document the LANGUAGE env var.
2023-08-02 10:06:48 -07:00
Dave Conroy 062310f287 Switch to Debian Bookworm 2023-07-25 16:19:58 -07:00
dave@tiredofit.ca 6e2d882863 Release 23.05.2-2.1 - See CHANGELOG.md 2023-07-25 09:56:05 -07:00
Dave Conroy 379d74a05e Fix unterminated sed command and font caching 2023-07-25 08:11:47 -07:00
dave@tiredofit.ca 35ff368880 Release 23.05.2-2 - See CHANGELOG.md 2023-07-24 12:08:59 -07:00
dave@tiredofit.ca 3de2c8a4b9 Release 23.05.2-1 - See CHANGELOG.md 2023-07-20 08:29:36 -07:00
dave@tiredofit.ca 5c8eab9f72 Release 23.05.1-2 - See CHANGELOG.md 2023-06-26 10:47:02 -07:00
dave@tiredofit.ca a851d189f8 Release 23.05.1-1 - See CHANGELOG.md 2023-06-23 10:39:47 -07:00
dave@tiredofit.ca 7284208857 Release 23.05.0-5 - See CHANGELOG.md 2023-06-12 06:39:30 -07:00
dave@tiredofit.ca 2a8950e065 Release 23.05.0-4 - See CHANGELOG.md 2023-06-09 05:45:25 -07:00
dave@tiredofit.ca a2a01894c6 Release 23.05.0-3 - See CHANGELOG.md 2023-06-05 08:02:29 -07:00
dave@tiredofit.ca 1ca12f8b21 Release 23.05.0-2 - See CHANGELOG.md 2023-06-01 12:26:04 -07:00
Dave Conroy 9d704f6f5f Update Github Feature Request Templates 2023-05-24 08:45:50 -07:00
dave@tiredofit.ca 9ae4bd0f7e Release 23.05.0-1 - See CHANGELOG.md 2023-05-19 08:23:04 -07:00
Dave Conroy bafe31df0e Collabora Office 22.05.14-4 2023-05-16 08:37:32 -07:00
dave@tiredofit.ca 4e1e110986 Release 2.4.34 - See CHANGELOG.md 2023-05-05 10:43:25 -07:00
dave@tiredofit.ca c6d4e81ad6 Release 2.4.33 - See CHANGELOG.md 2023-05-04 07:30:28 -07:00
dave@tiredofit.ca ed3a7c118d Release 2.4.32 - See CHANGELOG.md 2023-05-03 09:53:10 -07:00
Luc Didry 01badcdb36
📝 — Document the LANGUAGE env var. 2023-04-05 11:30:15 +02:00
5 changed files with 520 additions and 33 deletions

View file

@ -1,3 +1,299 @@
## 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
- Collabora Online 23.05.0-4
- Collabora Office 23.05.0-4
## 23.05.0-3 2023-06-05 <dave at tiredofit dot ca>
### Added
- Collabora Office cp-23.05.0-3
- Collabora Online cp-23.05.0-3
## 23.05.0-2 2023-06-01 <dave at tiredofit dot ca>
### Added
- 23.05.0-2
## 23.05.0-1 2023-05-19 <dave at tiredofit dot ca>
New versioning scheme
### Added
- Collabora Online 23.05.0-1
- Collabora Office 23.05.0-1
## 2.4.34 2023-05-05 <dave at tiredofit dot ca>
### Added
- Collabora Office cp-22.05.14-3
- Collabora Online cp-22.05.14-3
## 2.4.33 2023-05-04 <dave at tiredofit dot ca>
### Added
- Collabora Office cp-22.05.14-2
- Collabora Online cp-22.05.14-2
## 2.4.32 2023-05-03 <dave at tiredofit dot ca>
### Added
- Collabora Online 22.05.14-1
- Collabora Office 22.05.14-1
## 2.4.31 2023-04-26 <dave at tiredofit dot ca>
### Added

View file

@ -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-22.05.13-1"} \
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-22.05.13-1"} \
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 \
@ -127,7 +128,7 @@ RUN source /assets/functions/00-container && \
--without-package-format && \
chown -R cool ${GIT_REPO_SRC_CORE} && \
sudo -u cool make fetch && \
sudo -u cool make -j$(nproc) build-nocheck && \
sudo -u cool make -j$(nproc) build && \
mkdir -p /opt/libreoffice && \
chown -R cool /opt/libreoffice && \
cp -R ${GIT_REPO_SRC_CORE}/instdir/* /opt/libreoffice/ && \
@ -180,28 +181,25 @@ 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"
### Set Defaults
ENV ADMIN_USER=admin \
ADMIN_PASS=collaboraonline \
CONTAINER_ENABLE_MESSAGING=FALSE \
IMAGE_NAME="tiredofit/collabora-online" \
IMAGE_REPO_URL="https://github.com/tiredofit/docker-collabora-online/"
### Grab Compiled Assets from builder image
COPY --from=builder /opt/ /opt/
COPY CHANGELOG.md /assets/.changelogs/tiredofit_docker-collabora-online.md
COPY build-assets /build-assets
### Install Dependencies
RUN source /assets/functions/00-container && \
set -x && \
adduser --quiet --system --group --home /opt/cool cool && \
\
### Add Repositories
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 && \
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
package update && \
@ -239,7 +237,6 @@ RUN source /assets/functions/00-container && \
ttf-mscorefonts-installer \
&& \
\
### Setup Directories and Permissions
mkdir -p /etc/coolwsd && \
mv /opt/cool/coolwsd.xml /etc/coolwsd/ && \
mv /opt/cool/coolkitconfig.xcu /etc/coolwsd/ && \
@ -259,7 +256,6 @@ RUN source /assets/functions/00-container && \
touch /var/log/cool/coolwsd.log && \
chown -R cool /var/log/cool && \
\
### Setup LibreOffice Online Jails
sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice && \
\
if [ -d "/build-assets/container/src" ] && [ -n "$(ls -A "/build-assets/container/src" 2>/dev/null)" ]; then cp -R /build-assets/container/src/* / ; fi; \

173
Dockerfile.alpine Normal file
View file

@ -0,0 +1,173 @@
FROM tiredofit/alpine:3.18 as builder
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
LABEL org.opencontainers.image.source="https://github.com/tiredofit/docker-collabora-online"
### Buildtime arguments
ARG COLLABORA_ONLINE_VERSION
ARG COLLABORA_ONLINE_REPO_URL
ARG LIBREOFFICE_VERSION
ARG LIBREOFFICE_REPO_URL
ARG MAX_CONNECTIONS
ARG MAX_DOCUMENTS
ARG APP_NAME
ARG APP_BRAND
### Environment Variables
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-23.05.0-2"} \
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
#
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-23.05.0-2"} \
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_URL=${POCO_URL:-"https://github.com/pocoproject/poco/archive/"} \
#
MAX_CONNECTIONS=${MAX_CONNECTIONS:-"100000"} \
## Uses Approximately 20mb per document open
MAX_DOCUMENTS=${MAX_DOCUMENTS:-"100000"}
COPY build-assets /build-assets
RUN source /assets/functions/00-container && \
set -x && \
package update && \
package upgrade && \
package install .container-build-deps \
build-base \
git \
&& \
package install .collabora-office-build-deps \
abseil-cpp-dev \
apache-ant \
autoconf \
automake \
bison \
bluez-dev \
boost-dev \
box2d-dev \
clang \
clucene-dev \
coreutils \
cppunit-dev \
cups-dev \
doxygen \
findutils \
flex \
freetype-dev \
glew-dev \
glm-dev \
glu-dev \
gperf \
gpgme-dev \
gst-plugins-base-dev \
gstreamer-dev \
gtk+3.0-dev \
gtk4.0-dev \
harfbuzz-dev \
hunspell-dev \
hyphen-dev \
icu-dev \
junit \
kconfig-dev \
lcms2-dev \
libabw-dev \
libcdr-dev \
libe-book-dev \
libepubgen-dev \
libetonyek-dev \
libexttextcat-dev \
libfreehand-dev \
libjpeg-turbo-dev \
libmspub-dev \
libmwaw-dev \
libnumbertext-dev \
libodfgen-dev \
liborcus-dev \
libpagemaker-dev \
libpq-dev \
libqxp-dev \
libstaroffice-dev \
libvisio-dev \
libwebp-dev \
libwpd-dev \
libwpg-dev \
libwps-dev \
libxml2-utils \
libxrandr-dev \
libxrender-dev \
libxslt-dev \
libzmf-dev \
llvm-dev \
mariadb-dev \
mdds-dev \
mythes-dev \
neon-dev \
nss-dev \
openjpeg-dev \
openldap-dev \
openssl-dev \
perl \
perl-archive-zip \
plasma-framework-dev \
poppler-dev \
py3-setuptools \
python3-dev \
qt5-qtbase-dev \
qt5-qttools-dev \
qt6-qtbase-dev \
qt6-qttools-dev \
redland-dev \
sed \
tar \
unixodbc-dev \
vigra-dev \
xmlsec-dev \
xz \
zip \
&& \
\
### Build Poco
mkdir -p /usr/src/poco && \
curl -sSL ${POCO_URL}${POCO_VERSION} | tar xvfz - --strip 1 -C /usr/src/poco && \
cd /usr/src/poco && \
./configure \
--static \
--no-tests \
--no-samples \
--no-sharedlibs \
--cflags="-fPIC" \
--omit=Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,Redis,Encodings \
--prefix=/opt/poco \
&& \
make -j$(nproc) && \
make install && \
\
### Build Fetch LibreOffice - This will take a while..
clone_git_repo ${LIBREOFFICE_REPO_URL} ${LIBREOFFICE_VERSION} ${GIT_REPO_SRC_CORE}
RUN source /assets/functions/00-container && \
set -x && \
GIT_REPO_SRC_CORE=/usr/src/core && \
adduser -D -S -h /dev/null -s /sbin/nologin -u 1000 cool && \
cd /usr/src/core && \
if [ -d "/build-assets/core/src" ] && [ -n "$(ls -A "/build-assets/core/src" 2>/dev/null)" ]; then cp -R /build-assets/core/src/* / ; fi; \
if [ -d "/build-assets/core/scripts" ] && [ -n "$(ls -A "/build-assets/core/scripts" 2>/dev/null)" ]; then for script in /build-assets/core/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; fi ; \
sed -i "s|--enable-symbols|--disable-symbols|g" ${GIT_REPO_SRC_CORE}/distro-configs/CPLinux-LOKit.conf && \
\
echo "--prefix=/opt/libreoffice" >> ${GIT_REPO_SRC_CORE}/distro-configs/CPLinux-LOKit.conf && \
./autogen.sh \
--with-distro="CPLinux-LOKit" \
--disable-epm \
--without-package-format && \
chown -R cool ${GIT_REPO_SRC_CORE} && \
sudo -u cool make fetch
RUN source /assets/functions/00-container && \
set -x && \
sudo -u cool make -j$(nproc) build && \
mkdir -p /opt/libreoffice && \
chown -R cool /opt/libreoffice && \
cp -R ${GIT_REPO_SRC_CORE}/instdir/* /opt/libreoffice/

View file

@ -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)
@ -84,15 +85,17 @@ docker pull tiredofit/collabora-online:(imagetag)
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 |
| ------------------- | ------------------------ | -------- |
| `2022` | `22.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` |
| `6.4.x` | `6.4.x` | `2.0` |
| `6.0.x` | `4.0.x` | `1.6` |
| `5.3.x` | `3.4.x` | `1.1` |
| 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` |
| `2022` | `22.05.x` | `2.4.0` |
| `2021` | `21.11.0` | `2.3.0` |
| `6.4.x` | `6.4.x` | `2.1` |
| `6.4.x` | `6.4.x` | `2.0` |
| `6.0.x` | `4.0.x` | `1.6` |
| `5.3.x` | `3.4.x` | `1.1` |
#### Multi Architecture
Images are built primarily for `amd64` architecture, and may also include builds for `arm/v7`, `arm64` and others. These variants are all unsupported. Consider [sponsoring](https://github.com/sponsors/tiredofit) my work so that I can work with various hardware. To see if this image supports multiple architecures, type `docker manifest (image):(tag)`
@ -100,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.
@ -173,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.
@ -224,6 +244,7 @@ The image comes with English (US, GB, Canada variants) baked into the image, how
| | `uk` | Ukranian |
| | `vi` | Vietnamese |
Dont 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 |

View file

@ -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