deblan-mirror/docker-collabora-online
1
0
Fork 0
mirror of https://github.com/tiredofit/docker-collabora-online.git synced 2024-06-26 09:10:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0d3addf1b4 into 938b20ffff

Browse source
This commit is contained in:
Luc Didry 2023-01-12 13:45:47 +00:00 committed by GitHub
parent 938b20ffff 0d3addf1b4
commit 834f2cbfe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -9,6 +9,7 @@ ARG LIBREOFFICE_REPO_URL
ARG MAX_CONNECTIONS ARG MAX_CONNECTIONS
ARG MAX_DOCUMENTS ARG MAX_DOCUMENTS
ARG APP_NAME ARG APP_NAME
ARG APP_VENDOR
### 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-2"} \
@ -18,6 +19,7 @@ ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.9-2"} \
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"} \
APP_VENDOR=${APP_VENDOR:-"tiredofit@github"} \
# #
POCO_VERSION=${POCO_VERSION:-"poco-1.12.4-release.tar.gz"} \ POCO_VERSION=${POCO_VERSION:-"poco-1.12.4-release.tar.gz"} \
POCO_URL=${POCO_URL:-"https://github.com/pocoproject/poco/archive/"} \ POCO_URL=${POCO_URL:-"https://github.com/pocoproject/poco/archive/"} \
@ -147,7 +149,7 @@ RUN source /assets/functions/00-container && \
--with-poco-includes=/opt/poco/include \ --with-poco-includes=/opt/poco/include \
--with-poco-libs=/opt/poco/lib \ --with-poco-libs=/opt/poco/lib \
--with-app-name="${APP_NAME}" \ --with-app-name="${APP_NAME}" \
--with-vendor="tiredofit@github" \ --with-vendor="${APP_VENDOR}" \
${COOL_CONFIGURE_ARGS} \ ${COOL_CONFIGURE_ARGS} \
&& \ && \
make -j$(nproc) && \ make -j$(nproc) && \