From 4e09375d035c4451eeb0fa767ce22c2bcd919b92 Mon Sep 17 00:00:00 2001 From: Houssem Ben Ali Date: Tue, 20 Feb 2024 20:41:13 +0100 Subject: [PATCH] TASK-69778: Restore libreoffice packages + Install exo-documents-preview-addon 1.0.0 (#24) * Revert "fix captcha usage after libreoffice packages suppress" This reverts commit 67d927a1be7d826dd77c611910c2ba8d1c92e6f9. * Revert "feat: Remove libreoffice packages due to jodconverter removal (#21)" This reverts commit 060644c2f539b8264fbc9e70d232f2b656ea3974. * TASK-69778: Restore libreoffice packages + Install exo-documents-preview-addon 1.0.0 (cherry picked from commit 3d1866a3f1dc32dc53cb718b1dfe57282a4ceda8) --- Dockerfile | 4 ++-- README.md | 1 + configuration.md | 8 ++++++++ docker-compose.yml | 2 +- scripts/setenv-docker-customize.sh | 5 +++++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc9571f..01300e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get -qq update && \ echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections && \ echo "ttf-mscorefonts-installer msttcorefonts/present-mscorefonts-eula note" | debconf-set-selections && \ apt-get -qq -y install ${_APT_OPTIONS} ttf-mscorefonts-installer && \ - apt-get -qq -y install ${_APT_OPTIONS} fontconfig && \ + apt-get -qq -y install ${_APT_OPTIONS} libreoffice-calc libreoffice-draw libreoffice-impress libreoffice-math libreoffice-writer && \ apt-get -qq -y autoremove && \ apt-get -qq -y clean && \ rm -rf /var/lib/apt/lists/* @@ -40,7 +40,7 @@ ARG DOWNLOAD_URL # this allow to specifiy a user to download a protected binary ARG DOWNLOAD_USER # allow to override the list of addons to package by default -ARG ADDONS="exo-jdbc-driver-mysql:2.0.3 exo-jdbc-driver-postgresql:2.0.0" +ARG ADDONS="exo-documents-preview-addon:1.0.0 exo-jdbc-driver-mysql:2.0.3 exo-jdbc-driver-postgresql:2.0.0" # Default base directory on the plf archive ARG ARCHIVE_BASE_DIR=platform-community-${EXO_VERSION} diff --git a/README.md b/README.md index 691137a..cbbc149 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ The image is compatible with the following databases system : `MySQL` (default) - [Mongodb](#mongodb) - [ElasticSearch](#elasticsearch) - [LDAP / Active Directory](#ldap--active-directory) + - [JOD Converter](#jod-converter) - [Mail](#mail) - [JMX](#jmx) - [Remote Debugging](#remote-debugging) diff --git a/configuration.md b/configuration.md index 9d14d73..e006da6 100644 --- a/configuration.md +++ b/configuration.md @@ -128,6 +128,14 @@ The following environment variables should be passed to the container in order t | EXO_LDAP_POOL_TIMEOUT | NO | `60000` | the number of milliseconds that an idle connection may remain in the pool without being closed and removed from the pool. | | EXO_LDAP_POOL_MAX_SIZE | NO | `100` | the maximum number of connections per connection identity that can be maintained concurrently. | +### JOD Converter + +The following environment variables should be passed to the container in order to configure jodconverter : + +| VARIABLE | MANDATORY | DEFAULT VALUE | DESCRIPTION | +|------------------------|-----------|---------------|-------------------------------------------------------------------------------------------| +| EXO_JODCONVERTER_PORTS | NO | `2002` | comma separated list of ports to allocate to JOD Converter processes (ex: 2002,2003,2004) | + ### Mail The following environment variables should be passed to the container in order to configure the mail server configuration to use : diff --git a/docker-compose.yml b/docker-compose.yml index ccfdce5..31c9bbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: EXO_DB_NAME: exo EXO_DB_USER: exo EXO_DB_PASSWORD: my-secret-pw - EXO_ADDONS_LIST: "exo-documents-preview-addon:1.0.x-SNAPSHOT" + EXO_ADDONS_LIST: "exo-documents-preview-addon:1.0.0" EXO_ADDONS_REMOVE_LIST: "exo-onlyoffice" EXO_ADDONS_NOCOMPAT_MODE: "true" EXO_JVM_LOG_GC_ENABLED: "true" diff --git a/scripts/setenv-docker-customize.sh b/scripts/setenv-docker-customize.sh index 39ff85e..6d70d35 100644 --- a/scripts/setenv-docker-customize.sh +++ b/scripts/setenv-docker-customize.sh @@ -159,6 +159,8 @@ EXO_ES_URL="${EXO_ES_SCHEME}://${EXO_ES_HOST}:${EXO_ES_PORT}" [ -z "${EXO_LDAP_POOL_TIMEOUT}" ] && EXO_LDAP_POOL_TIMEOUT="60000" [ -z "${EXO_LDAP_POOL_MAX_SIZE}" ] && EXO_LDAP_POOL_MAX_SIZE="100" +[ -z "${EXO_JODCONVERTER_PORTS}" ] && EXO_JODCONVERTER_PORTS="2002" + [ -z "${EXO_PROFILES}" ] && EXO_PROFILES="all" [ -z "${EXO_REWARDS_WALLET_ADMIN_KEY}" ] && EXO_REWARDS_WALLET_ADMIN_KEY="changeThisKey" @@ -468,6 +470,9 @@ if [ "${EXO_JMX_ENABLED}" = "true" ]; then add_in_exo_configuration "exo.es.indexing.replica.number.default=${EXO_ES_INDEX_REPLICA_NB}" add_in_exo_configuration "exo.es.indexing.shard.number.default=${EXO_ES_INDEX_SHARD_NB}" + # JOD Converter + add_in_exo_configuration "exo.jodconverter.portnumbers=${EXO_JODCONVERTER_PORTS}" + # eXo Chat configuration add_in_chat_configuration "# eXo Chat server configuration" # The password to access REST service on the eXo Chat server.