mirror of
https://github.com/tiredofit/docker-collabora-online.git
synced 2024-06-08 00:32:24 +02:00
2.1.5
This commit is contained in:
parent
3c6efafa70
commit
675867a0ba
|
@ -1,3 +1,12 @@
|
||||||
|
## 2.1.5 2021-05-17 <dave at tiredofit dot ca>
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Libreoffice 6.4-38
|
||||||
|
- Collabora Online 6.4.8-6
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Changd LOOL_* variables to COLLABORA_ONLINE_*
|
||||||
|
|
||||||
## 2.1.4 2021-05-06 <dave at tiredofit dot ca>
|
## 2.1.4 2021-05-06 <dave at tiredofit dot ca>
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
22
Dockerfile
22
Dockerfile
|
@ -2,25 +2,25 @@ FROM tiredofit/debian:buster as builder
|
||||||
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
|
||||||
|
|
||||||
### Buildtime arguments
|
### Buildtime arguments
|
||||||
|
ARG COLLABORA_ONLINE_BRANCH
|
||||||
|
ARG COLLABORA_ONLINE_VERSION
|
||||||
|
ARG COLLABORA_ONLINE_REPO_URL
|
||||||
ARG LIBREOFFICE_BRANCH
|
ARG LIBREOFFICE_BRANCH
|
||||||
ARG LIBREOFFICE_VERSION
|
ARG LIBREOFFICE_VERSION
|
||||||
ARG LIBREOFFICE_REPO_URL
|
ARG LIBREOFFICE_REPO_URL
|
||||||
ARG LOOL_BRANCH
|
|
||||||
ARG LOOL_VERSION
|
|
||||||
ARG LOOL_REPO_URL
|
|
||||||
ARG MAX_CONNECTIONS
|
ARG MAX_CONNECTIONS
|
||||||
ARG MAX_DOCUMENTS
|
ARG MAX_DOCUMENTS
|
||||||
ARG APP_NAME
|
ARG APP_NAME
|
||||||
|
|
||||||
### Environment Variables
|
### Environment Variables
|
||||||
ENV LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \
|
ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \
|
||||||
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-6.4-37"} \
|
COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-6.4.8-6"} \
|
||||||
|
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
|
||||||
|
#
|
||||||
|
LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \
|
||||||
|
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-6.4-38"} \
|
||||||
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
|
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
|
||||||
#
|
#
|
||||||
LOOL_BRANCH=${LOOL_BRANCH:-"master"} \
|
|
||||||
LOOL_VERSION=${LOOL_VERSION:-"cp-6.4.8-4"} \
|
|
||||||
LOOL_REPO_URL=${LOOL_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
|
|
||||||
#
|
|
||||||
APP_NAME=${APP_NAME:-"Document Editor"} \
|
APP_NAME=${APP_NAME:-"Document Editor"} \
|
||||||
#
|
#
|
||||||
POCO_VERSION=${POCO_VERSION:-"poco-1.10.1-release.tar.gz"} \
|
POCO_VERSION=${POCO_VERSION:-"poco-1.10.1-release.tar.gz"} \
|
||||||
|
@ -131,9 +131,9 @@ RUN set -x && \
|
||||||
cp -R /usr/src/libreoffice-core/instdir/* /opt/libreoffice/ && \
|
cp -R /usr/src/libreoffice-core/instdir/* /opt/libreoffice/ && \
|
||||||
\
|
\
|
||||||
### Build LibreOffice Online (Not as long as above)
|
### Build LibreOffice Online (Not as long as above)
|
||||||
git clone -b ${LOOL_BRANCH} ${LOOL_REPO_URL} /usr/src/libreoffice-online && \
|
git clone -b ${COLLABORA_ONLINE_BRANCH} ${COLLABORA_ONLINE_REPO_URL} /usr/src/libreoffice-online && \
|
||||||
cd /usr/src/libreoffice-online && \
|
cd /usr/src/libreoffice-online && \
|
||||||
git checkout ${LOOL_VERSION} && \
|
git checkout ${COLLABORA_ONLINE_VERSION} && \
|
||||||
if [ -d "/build-assets/online/src" ] ; then cp -R /build-assets/online/src/* /usr/src/libreoffice-online ; fi; \
|
if [ -d "/build-assets/online/src" ] ; then cp -R /build-assets/online/src/* /usr/src/libreoffice-online ; fi; \
|
||||||
if [ -d "/build-assets/online/scripts" ] ; then for script in /build-assets/online/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; fi ; \
|
if [ -d "/build-assets/online/scripts" ] ; then for script in /build-assets/online/scripts/*.sh; do echo "** Applying $script"; bash $script; done && \ ; fi ; \
|
||||||
sed -i "s|Collabora Online Development Edition|${APP_NAME}|g" /usr/src/libreoffice-online/configure.ac && \
|
sed -i "s|Collabora Online Development Edition|${APP_NAME}|g" /usr/src/libreoffice-online/configure.ac && \
|
||||||
|
|
Loading…
Reference in a new issue