mirror of
https://github.com/tiredofit/docker-collabora-online.git
synced 2024-05-04 15:33:10 +02:00
Release 2.4.19 - See CHANGELOG.md
This commit is contained in:
parent
e83ba22ac9
commit
538a09ea57
30
.github/workflows/main.yml
vendored
30
.github/workflows/main.yml
vendored
|
@ -13,21 +13,21 @@ jobs:
|
||||||
docker:
|
docker:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: FreeUp
|
# - name: FreeUp
|
||||||
id: free
|
# id: free
|
||||||
run: |
|
# run: |
|
||||||
before=$(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}')
|
# before=$(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}')
|
||||||
sudo apt-get remove -y '^dotnet-.*'
|
# sudo apt-get remove -y '^dotnet-.*'
|
||||||
sudo apt-get remove -y '^llvm-.*'
|
# sudo apt-get remove -y '^llvm-.*'
|
||||||
sudo apt-get remove -y 'php.*'
|
# sudo apt-get remove -y 'php.*'
|
||||||
sudo apt-get remove -y '^mongodb-.*'
|
# sudo apt-get remove -y '^mongodb-.*'
|
||||||
sudo apt-get remove -y '^mysql-.*'
|
# sudo apt-get remove -y '^mysql-.*'
|
||||||
sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
|
# sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
|
||||||
sudo apt-get -y autoremove
|
# sudo apt-get -y autoremove
|
||||||
sudo apt-get clean
|
# sudo apt-get clean
|
||||||
after=$(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}')
|
# after=$(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}')
|
||||||
saved=$((after-before))
|
# saved=$((after-before))
|
||||||
echo "Saved: $saved"
|
# echo "Saved: $saved"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
12
CHANGELOG.md
12
CHANGELOG.md
|
@ -1,3 +1,15 @@
|
||||||
|
## 2.4.19 2023-01-18 <dave at tiredofit dot ca>
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Collabora Office cp-22.05.9-3
|
||||||
|
- Collabora Online cp-22.05.9-3
|
||||||
|
- Add libpng-dev packages for building
|
||||||
|
- Add x11-dev packages for building
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Switch to package management via base image functions
|
||||||
|
|
||||||
|
|
||||||
## 2.4.18 2022-12-19 <dave at tiredofit dot ca>
|
## 2.4.18 2022-12-19 <dave at tiredofit dot ca>
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
231
Dockerfile
231
Dockerfile
|
@ -12,10 +12,10 @@ ARG APP_NAME
|
||||||
ARG APP_BRAND
|
ARG APP_BRAND
|
||||||
|
|
||||||
### Environment Variables
|
### Environment Variables
|
||||||
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.9-2"} \
|
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.9-3"} \
|
||||||
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
|
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
|
||||||
#
|
#
|
||||||
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.9-2"} \
|
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.9-3"} \
|
||||||
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
|
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
|
||||||
#
|
#
|
||||||
APP_NAME=${APP_NAME:-"Document Editor"} \
|
APP_NAME=${APP_NAME:-"Document Editor"} \
|
||||||
|
@ -32,11 +32,11 @@ COPY build-assets /build-assets
|
||||||
|
|
||||||
RUN source /assets/functions/00-container && \
|
RUN source /assets/functions/00-container && \
|
||||||
set -x && \
|
set -x && \
|
||||||
apt-get update && \
|
package update && \
|
||||||
apt-get -o Dpkg::Options::="--force-confold" upgrade -y && \
|
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-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 && \
|
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_14.x | bash - && \
|
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
|
||||||
\
|
\
|
||||||
### Setup Distribution
|
### Setup Distribution
|
||||||
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
||||||
|
@ -46,74 +46,80 @@ RUN source /assets/functions/00-container && \
|
||||||
chown cool:cool /home/cool -R && \
|
chown cool:cool /home/cool -R && \
|
||||||
\
|
\
|
||||||
BUILD_DEPS=' \
|
BUILD_DEPS=' \
|
||||||
adduser \
|
adduser \
|
||||||
automake \
|
automake \
|
||||||
build-essential \
|
build-essential \
|
||||||
cpio \
|
bison \
|
||||||
default-jre \
|
cpio \
|
||||||
devscripts \
|
default-jre \
|
||||||
fontconfig \
|
devscripts \
|
||||||
g++ \
|
flex \
|
||||||
git \
|
fontconfig \
|
||||||
inotify-tools \
|
g++ \
|
||||||
libcap-dev \
|
git \
|
||||||
libcap2-bin \
|
gperf \
|
||||||
libcppunit-dev \
|
inotify-tools \
|
||||||
libghc-zlib-dev \
|
libcap-dev \
|
||||||
libkrb5-dev \
|
libcap2-bin \
|
||||||
libpam-dev \
|
libcppunit-dev \
|
||||||
libpam0g-dev \
|
libghc-zlib-dev \
|
||||||
libpng16-16 \
|
libkrb5-dev \
|
||||||
libssl-dev \
|
libpam-dev \
|
||||||
libtool \
|
libpam0g-dev \
|
||||||
libubsan1 \
|
libpng-dev \
|
||||||
libzstd-dev \
|
libssl-dev \
|
||||||
locales-all \
|
libtool \
|
||||||
m4 \
|
libubsan1 \
|
||||||
nasm \
|
libx11-dev \
|
||||||
nodejs \
|
libzstd-dev \
|
||||||
openssl \
|
locales-all \
|
||||||
pkg-config \
|
m4 \
|
||||||
procps \
|
nasm \
|
||||||
python3-lxml \
|
nodejs \
|
||||||
python3-polib \
|
openssl \
|
||||||
sudo \
|
pkg-config \
|
||||||
translate-toolkit \
|
procps \
|
||||||
ttf-mscorefonts-installer \
|
python3-lxml \
|
||||||
wget \
|
python3-polib \
|
||||||
' && \
|
sudo \
|
||||||
|
translate-toolkit \
|
||||||
|
ttf-mscorefonts-installer \
|
||||||
|
unzip \
|
||||||
|
wget \
|
||||||
|
zip \
|
||||||
|
' && \
|
||||||
## Add Build Dependencies
|
## Add Build Dependencies
|
||||||
apt-get install -y \
|
package install -y \
|
||||||
${BUILD_DEPS} \
|
${BUILD_DEPS} \
|
||||||
&& \
|
&& \
|
||||||
\
|
\
|
||||||
apt-get build-dep -y \
|
package build-dep -y \
|
||||||
libreoffice \
|
libreoffice \
|
||||||
&& \
|
&& \
|
||||||
\
|
\
|
||||||
### Build Poco
|
### Build Poco
|
||||||
mkdir -p /usr/src/poco && \
|
mkdir -p /usr/src/poco && \
|
||||||
curl -sSL ${POCO_URL}${POCO_VERSION} | tar xvfz - --strip 1 -C /usr/src/poco && \
|
curl -sSL ${POCO_URL}${POCO_VERSION} | tar xvfz - --strip 1 -C /usr/src/poco && \
|
||||||
cd /usr/src/poco && \
|
cd /usr/src/poco && \
|
||||||
./configure \
|
./configure \
|
||||||
--static \
|
--static \
|
||||||
--no-tests \
|
--no-tests \
|
||||||
--no-samples \
|
--no-samples \
|
||||||
--no-sharedlibs \
|
--no-sharedlibs \
|
||||||
--cflags="-fPIC" \
|
--cflags="-fPIC" \
|
||||||
--omit=Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,Redis,Encodings \
|
--omit=Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,Redis,Encodings \
|
||||||
--prefix=/opt/poco \
|
--prefix=/opt/poco \
|
||||||
&& \
|
&& \
|
||||||
make -j$(nproc) && \
|
make -j$(nproc) && \
|
||||||
make install && \
|
make install && \
|
||||||
\
|
\
|
||||||
### Build Fetch LibreOffice - This will take a while..
|
### Build Fetch LibreOffice - This will take a while..
|
||||||
clone_git_repo ${LIBREOFFICE_REPO_URL} ${LIBREOFFICE_VERSION} ${GIT_REPO_SRC_CORE} && \
|
clone_git_repo ${LIBREOFFICE_REPO_URL} ${LIBREOFFICE_VERSION} ${GIT_REPO_SRC_CORE} && \
|
||||||
if [ -d "/build-assets/core/src" ] ; then cp -R /build-assets/core/src/* ${GIT_REPO_SRC_CORE} ; fi; \
|
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" ] ; then for script in /build-assets/core/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; 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 && \
|
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 && \
|
echo "--prefix=/opt/libreoffice" >> ${GIT_REPO_SRC_CORE}/distro-configs/CPLinux-LOKit.conf && \
|
||||||
./autogen.sh \
|
./autogen.sh \
|
||||||
--with-distro="CPLinux-LOKit" \
|
--with-distro="CPLinux-LOKit" \
|
||||||
--disable-epm \
|
--disable-epm \
|
||||||
|
@ -138,7 +144,8 @@ RUN source /assets/functions/00-container && \
|
||||||
${GIT_REPO_SRC_ONLINE}/browser/src/core/Socket.js \
|
${GIT_REPO_SRC_ONLINE}/browser/src/core/Socket.js \
|
||||||
${GIT_REPO_SRC_ONLINE}/browser/src/layer/marker/ProgressOverlay.js \
|
${GIT_REPO_SRC_ONLINE}/browser/src/layer/marker/ProgressOverlay.js \
|
||||||
${GIT_REPO_SRC_ONLINE}/browser/src/map/Clipboard.js \
|
${GIT_REPO_SRC_ONLINE}/browser/src/map/Clipboard.js \
|
||||||
${GIT_REPO_SRC_ONLINE}/browser/welcome/*.html && \
|
${GIT_REPO_SRC_ONLINE}/browser/welcome/*.html \
|
||||||
|
&& \
|
||||||
./autogen.sh && \
|
./autogen.sh && \
|
||||||
./configure --enable-silent-rules \
|
./configure --enable-silent-rules \
|
||||||
--with-lokit-path="${GIT_REPO_SRC_CORE}/include" \
|
--with-lokit-path="${GIT_REPO_SRC_CORE}/include" \
|
||||||
|
@ -164,14 +171,13 @@ RUN source /assets/functions/00-container && \
|
||||||
\
|
\
|
||||||
### Cleanup
|
### Cleanup
|
||||||
cd / && \
|
cd / && \
|
||||||
apt-get autoremove -y && \
|
package cleanup && \
|
||||||
apt-get clean && \
|
rm -rf \
|
||||||
rm -rf /usr/src/* && \
|
/usr/share/doc \
|
||||||
rm -rf /usr/share/doc && \
|
/usr/share/locale \
|
||||||
rm -rf /usr/share/man && \
|
/usr/share/man \
|
||||||
rm -rf /usr/share/locale && \
|
/usr/src/* \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
/var/log/*
|
||||||
rm -rf /var/log/*
|
|
||||||
|
|
||||||
FROM docker.io/tiredofit/debian:bullseye
|
FROM docker.io/tiredofit/debian:bullseye
|
||||||
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
||||||
|
@ -190,46 +196,47 @@ COPY CHANGELOG.md /assets/.changelogs/tiredofit_docker-collabora-online.md
|
||||||
COPY build-assets /build-assets
|
COPY build-assets /build-assets
|
||||||
|
|
||||||
### Install Dependencies
|
### Install Dependencies
|
||||||
RUN set -x && \
|
RUN source /assets/functions/00-container && \
|
||||||
|
set -x && \
|
||||||
adduser --quiet --system --group --home /opt/cool cool && \
|
adduser --quiet --system --group --home /opt/cool cool && \
|
||||||
\
|
\
|
||||||
### Add Repositories
|
### 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 "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 && \
|
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
|
||||||
apt-get update && \
|
package update && \
|
||||||
apt-get -o Dpkg::Options::="--force-confold" upgrade -y && \
|
apt-get -o Dpkg::Options::="--force-confold" upgrade -y && \
|
||||||
apt-get install -y\
|
package install \
|
||||||
apt-transport-https \
|
apt-transport-https \
|
||||||
cpio \
|
cpio \
|
||||||
findutils \
|
findutils \
|
||||||
fontconfig \
|
fontconfig \
|
||||||
hunspell \
|
hunspell \
|
||||||
hunspell-en-ca \
|
hunspell-en-ca \
|
||||||
hunspell-en-gb \
|
hunspell-en-gb \
|
||||||
hunspell-en-us \
|
hunspell-en-us \
|
||||||
inotify-tools \
|
inotify-tools \
|
||||||
libcap2-bin \
|
libcap2-bin \
|
||||||
libcups2 \
|
libcups2 \
|
||||||
libfontconfig1 \
|
libfontconfig1 \
|
||||||
libfreetype6 \
|
libfreetype6 \
|
||||||
libgl1-mesa-glx \
|
libgl1-mesa-glx \
|
||||||
libpam0g \
|
libpam0g \
|
||||||
libpng16-16 \
|
libpng16-16 \
|
||||||
libsm6 \
|
libsm6 \
|
||||||
libubsan1 \
|
libubsan1 \
|
||||||
libxcb-render0 \
|
libxcb-render0 \
|
||||||
libxcb-shm0 \
|
libxcb-shm0 \
|
||||||
libxinerama1 \
|
libxinerama1 \
|
||||||
libxrender1 \
|
libxrender1 \
|
||||||
locales \
|
locales \
|
||||||
locales-all \
|
locales-all \
|
||||||
openssl \
|
openssl \
|
||||||
openssh-client \
|
openssh-client \
|
||||||
procps \
|
procps \
|
||||||
python3-requests \
|
python3-requests \
|
||||||
python3-websocket \
|
python3-websocket \
|
||||||
ttf-mscorefonts-installer \
|
ttf-mscorefonts-installer \
|
||||||
&& \
|
&& \
|
||||||
\
|
\
|
||||||
### Setup Directories and Permissions
|
### Setup Directories and Permissions
|
||||||
mkdir -p /etc/coolwsd && \
|
mkdir -p /etc/coolwsd && \
|
||||||
|
@ -254,20 +261,18 @@ RUN set -x && \
|
||||||
### Setup LibreOffice Online Jails
|
### Setup LibreOffice Online Jails
|
||||||
sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice && \
|
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/* / ; fi; \
|
if [ -d "/build-assets/container/src" ] && [ -n "$(ls -A "/build-assets/container/src" 2>/dev/null)" ]; 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 ; \
|
if [ -d "/build-assets/container/scripts" ] && [ -n "$(ls -A "/build-assets/container/scripts" 2>/dev/null)" ]; then for script in /build-assets/container/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; fi ; \
|
||||||
apt-get autoremove -y && \
|
package cleanup && \
|
||||||
apt-get clean && \
|
rm -rf \
|
||||||
\
|
/build-assets \
|
||||||
rm -rf /usr/src/* && \
|
/tmp/* \
|
||||||
rm -rf /usr/share/doc && \
|
/usr/src/* \
|
||||||
rm -rf /usr/share/man && \
|
/usr/share/doc \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
/usr/share/man \
|
||||||
rm -rf /var/log/* && \
|
/var/lib/apt/lists/* \
|
||||||
rm -rf /build-assets && \
|
/var/log/*
|
||||||
rm -rf /tmp/*
|
|
||||||
|
|
||||||
### Networking Configuration
|
|
||||||
EXPOSE 9980
|
EXPOSE 9980
|
||||||
|
|
||||||
### Assets
|
### Assets
|
||||||
|
|
26
README.md
26
README.md
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
## About
|
## About
|
||||||
|
|
||||||
This will build a Docker image for [Collabora Online](https://www.collaboraoffice.com/collabora-online//) for editing documents in a browser from supported applications.
|
This will build a Docker image for [Collabora Online](https://www.collaboraoffice.com/collabora-online/) for editing documents in a browser from supported applications.
|
||||||
|
|
||||||
* Configurable Concurrent User and Document Limit (set to generarous values by default)
|
* Configurable Concurrent User and Document Limit (set to generarous values by default)
|
||||||
* Custom Font Support
|
* Custom Font Support
|
||||||
|
@ -128,18 +128,18 @@ 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 |
|
| [OS Base](https://github.com/tiredofit/docker-debian/) | Customized Image based on Debian Linux |
|
||||||
|
|
||||||
#### General Usage
|
#### General Usage
|
||||||
| Parameter | Description | Default |
|
| Parameter | Description | Default |
|
||||||
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------- |
|
| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------------- |
|
||||||
| `SETUP_TYPE` | Automatically generate configuration with defaults. Set to `MANUAL` and map the configuration file to use your own | `AUTO` |
|
| `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` (no wildcards) | `` |
|
| `ALLOWED_HOSTS` | Set which domains which can access service Seperate Multiple with `,` - Example: `https://www.example\.org` (no wildcards) | `` |
|
||||||
| `EXTRA_OPTIONS` | If you want to pass additional arguments upon startup, add it here | `` |
|
| `EXTRA_OPTIONS` | If you want to pass additional arguments upon startup, add it here | `` |
|
||||||
| `INTERFACE` | Web interface type `classic` or `notebookbar` | `notebookbar` |
|
| `INTERFACE` | Web interface type `classic` or `notebookbar` | `notebookbar` |
|
||||||
| `WATERMARK_OPACITY` | Watermark Opacity | `0.2` |
|
| `WATERMARK_OPACITY` | Watermark Opacity | `0.2` |
|
||||||
| `WATERMARK_TEXT` | Text to display for watermark | `` |
|
| `WATERMARK_TEXT` | Text to display for watermark | `` |
|
||||||
| `ENABLE_MACROS` | Enable Macros | `FALSE` |
|
| `ENABLE_MACROS` | Enable Macros | `FALSE` |
|
||||||
| `MACRO_SECURITY_LEVEL` | Macro Security Level `1` Medium `0` Low | `1` |
|
| `MACRO_SECURITY_LEVEL` | Macro Security Level `1` Medium `0` Low | `1` |
|
||||||
| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics | `FALSE` |
|
| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics | `FALSE` |
|
||||||
| `ENABLE_HOME_MODE` | Enable more features with home mode | `FALSE` |
|
| `ENABLE_HOME_MODE` | Enable more features with home mode | `FALSE` |
|
||||||
|
|
||||||
|
|
||||||
#### Administration
|
#### Administration
|
||||||
|
|
|
@ -1,26 +1,20 @@
|
||||||
version: '3.7'
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
collabora-online-app:
|
collabora-online-app:
|
||||||
image: tiredofit/collabora-online
|
image: tiredofit/collabora-online
|
||||||
container_name: collabora-online-app
|
container_name: collabora-online-app
|
||||||
hostname: collabora-online.example.com
|
hostname: online.example.com
|
||||||
expose:
|
|
||||||
- 9980
|
|
||||||
cap_add:
|
cap_add:
|
||||||
- MKNOD
|
- MKNOD
|
||||||
- NET_ADMIN
|
- NET_ADMIN
|
||||||
privileged: true
|
privileged: true
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.frontend.rule=Host:collabora-online.example.com
|
- traefik.http.routers.collabora-online-app.rule=Host(`online.example.com`)
|
||||||
- traefik.port=9980
|
- traefik.http.services.collabora-online-app.loadbalancer.server.port=9980
|
||||||
- traefik.protocol=http
|
|
||||||
- traefik.docker.network=proxy
|
|
||||||
- traefik.backend=collabora-online-app
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./logs:/logs
|
- ./logs:/logs
|
||||||
environment:
|
environment:
|
||||||
|
- TIMEZONE=America/Vancouver
|
||||||
- CONTAINER_NAME=collabora-online-app
|
- CONTAINER_NAME=collabora-online-app
|
||||||
|
|
||||||
- ADMIN_USER=admin
|
- ADMIN_USER=admin
|
||||||
|
@ -30,6 +24,9 @@ services:
|
||||||
|
|
||||||
- ENABLE_TLS=FALSE
|
- ENABLE_TLS=FALSE
|
||||||
- ENABLE_TLS_REVERSE_PROXY=TRUE
|
- ENABLE_TLS_REVERSE_PROXY=TRUE
|
||||||
|
|
||||||
|
- INTERFACE=notebookbar
|
||||||
|
- LOG_TYPE=FILE
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- services
|
- services
|
||||||
|
@ -40,4 +37,3 @@ networks:
|
||||||
external: true
|
external: true
|
||||||
services:
|
services:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
version: '3.7'
|
|
||||||
services:
|
|
||||||
|
|
||||||
collabora-online-app:
|
|
||||||
image: tiredofit/collabora-online:latest
|
|
||||||
hostname: collabora-online.example.com
|
|
||||||
container_name: collabora-online-app
|
|
||||||
expose:
|
|
||||||
- 9980
|
|
||||||
cap_add:
|
|
||||||
- MKNOD
|
|
||||||
labels:
|
|
||||||
- traefik.enable=true
|
|
||||||
- traefik.frontend.rule=Host:collabora-online.example.com
|
|
||||||
- traefik.port=9980
|
|
||||||
- traefik.protocol=http
|
|
||||||
- traefik.docker.network=proxy
|
|
||||||
- traefik.backend=collabora-online-app
|
|
||||||
environment:
|
|
||||||
- VIRTUAL_HOST=collabora-online.example.com
|
|
||||||
- VIRTUAL_NETWORK=proxy
|
|
||||||
- VIRTUAL_PORT=9980
|
|
||||||
- VIRTUAL_PROTO=https
|
|
||||||
- LETSENCRYPT_HOST=collabora-online.example.com
|
|
||||||
- LETSENCRYPT_EMAIL=techsupport@example.com
|
|
||||||
|
|
||||||
- CONTAINER_NAME=collabora-online-app
|
|
||||||
|
|
||||||
- ADMIN_USER=admin
|
|
||||||
- ADMIN_PASS=collabora-online
|
|
||||||
- ALLOWED_HOSTS=host1.example.org,host2.example.org,host1.example.net
|
|
||||||
- DICTIONARIES="en_GB en_US"
|
|
||||||
- LOG_LEVEL=warning
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
- internal
|
|
||||||
- services
|
|
||||||
restart: always
|
|
||||||
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
internal:
|
|
||||||
external: false
|
|
||||||
services:
|
|
||||||
external: true
|
|
||||||
|
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
collabora-online-app:
|
|
||||||
image: tiredofit/collabora-online
|
|
||||||
hostname: collabora-online.example.com
|
|
||||||
container_name: collabora-online-app
|
|
||||||
expose:
|
|
||||||
- 9980
|
|
||||||
cap_add:
|
|
||||||
- MKNOD
|
|
||||||
environment:
|
|
||||||
- VIRTUAL_HOST=collabora-online.example.com
|
|
||||||
- VIRTUAL_NETWORK=nginx-proxy
|
|
||||||
- VIRTUAL_PORT=9980
|
|
||||||
- VIRTUAL_PROTO=https
|
|
||||||
- LETSENCRYPT_HOST=collabora-online.example.com
|
|
||||||
- LETSENCRYPT_EMAIL=techsupport@example.com
|
|
||||||
|
|
||||||
- CONTAINER_NAME=collabora-online-app
|
|
||||||
|
|
||||||
- ADMIN_USER=admin
|
|
||||||
- ADMIN_PASS=collabora-online
|
|
||||||
- ALLOWED_HOSTS=allowedhostname.example.com
|
|
||||||
- DICTIONARIES="en_GB en_US"
|
|
||||||
- LOG_LEVEL=warning
|
|
||||||
networks:
|
|
||||||
- proxy-tier
|
|
||||||
|
|
||||||
networks:
|
|
||||||
proxy-tier:
|
|
||||||
external:
|
|
||||||
name: nginx-proxy
|
|
||||||
|
|
|
@ -8,9 +8,8 @@ check_container_initialized
|
||||||
check_service_initialized init 10-coolwsd
|
check_service_initialized init 10-coolwsd
|
||||||
liftoff
|
liftoff
|
||||||
|
|
||||||
while inotifywait -q -e create,delete,modify,attrib /etc/coolwsd/coolwsd.xml
|
while inotifywait -q -e create,delete,modify,attrib /etc/coolwsd/coolwsd.xml ; do
|
||||||
do
|
print_info "Reloading coolwsd configuration do to a detected certificate change"
|
||||||
print_info "Reloading coolwsd configuration do to a detected certificate change"
|
pkill -f --signal 1 coolwsd
|
||||||
pkill -f --signal 1 coolwsd
|
exit 0
|
||||||
exit 0
|
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue