deblan-mirror/docker-collabora-online
1
0
Fork 0
mirror of https://github.com/tiredofit/docker-collabora-online.git synced 2024-05-18 05:56:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tiredofit/docker-collabora-online

Browse source
This commit is contained in:
Dave Conroy 2022-06-20 13:44:38 -07:00
parent 240a2ba5e4 5c9a2409b7
commit 419fc1ea24
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,3 +1,10 @@
## 2.3.7 2022-06-20 <dave at tiredofit dot ca>
### Added
- Collabora Online cp21.11.5-3
- Libreoffice Core cp-21.06.31-1
## 2.4.1 2022-04-12 <dave at tiredofit dot ca>
### Changed

6
Dockerfile
View file

@ -14,11 +14,11 @@ ARG APP_NAME
### Environment Variables
ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \
COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.0-1"} \
COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-21.11.5-3"} \
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
#
LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.0-1"} \
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-21.06.31-1"} \
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
#
APP_NAME=${APP_NAME:-"Document Editor"} \
@ -30,7 +30,7 @@ ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \
## Uses Approximately 20mb per document open
MAX_DOCUMENTS=${MAX_DOCUMENTS:-"100000"}
ADD build-assets /build-assets
#ADD build-assets /build-assets
### Get Updates
RUN set -x && \