From a9ddc91aaffd6528a1547e04c2def3fcf7b6be75 Mon Sep 17 00:00:00 2001 From: Torsten Simon Date: Thu, 14 Nov 2024 11:34:57 +0100 Subject: [PATCH 1/2] Revert "fix: missing quotes in entrypoint" This reverts commit c3ce60b507505a30cdf43aecbcde9dde1c87cc56. --- service/src/main/docker/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/docker/entrypoint.sh b/service/src/main/docker/entrypoint.sh index f983bad..392f491 100644 --- a/service/src/main/docker/entrypoint.sh +++ b/service/src/main/docker/entrypoint.sh @@ -60,7 +60,7 @@ sed -i -r "s|memory_limit.*|memory_limit = ${memory_limit}|" "${php_ini}" sed -i "s|define('ONLYOFFICE_DOCUMENT_SERVER', '.*')|define('ONLYOFFICE_DOCUMENT_SERVER', '${only_office_document_server}')|g" "${conf}" sed -i "s|define('ONLYOFFICE_PLUGIN_URL', '.*')|define('ONLYOFFICE_PLUGIN_URL', '${only_office_plugin_url}')|g" "${conf}" -sed -i "s|define('ONLYOFFICE_EDUSHARING_PLUGIN', '.*')|define('ONLYOFFICE_EDUSHARING_PLUGIN', '${only_office_edusharing_plugin}')|g" "${conf}" +sed -i "s|define('ONLYOFFICE_EDUSHARING_PLUGIN', .*)|define('ONLYOFFICE_EDUSHARING_PLUGIN', ${only_office_edusharing_plugin})|g" "${conf}" sed -i "s|define('ONLYOFFICE_EDUSHARING_PLUGIN_LABEL', '.*')|define('ONLYOFFICE_EDUSHARING_PLUGIN_LABEL', '${only_office_edusharing_plugin_label}')|g" "${conf}" sed -i "s|define('ONLYOFFICE_EDUSHARING_PLUGIN_ICON', '.*')|define('ONLYOFFICE_EDUSHARING_PLUGIN_ICON', '${only_office_edusharing_plugin_icon}')|g" "${conf}" sed -i "s|define('ONLYOFFICE_JWT_SECRET', '.*')|define('ONLYOFFICE_JWT_SECRET', '${only_office_jwt_secret}')|g" "${conf}" From 76b79aa41c32625858fcf1de13594261671bae88 Mon Sep 17 00:00:00 2001 From: Torsten Simon Date: Thu, 14 Nov 2024 11:36:18 +0100 Subject: [PATCH 2/2] fix:default plugin value "false" --- service/src/main/docker/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/docker/entrypoint.sh b/service/src/main/docker/entrypoint.sh index 392f491..4f26475 100644 --- a/service/src/main/docker/entrypoint.sh +++ b/service/src/main/docker/entrypoint.sh @@ -29,7 +29,7 @@ memory_limit="${MEMORY_LIMIT:-1024M}" only_office_document_server="${ONLYOFFICE_DOCUMENT_SERVER:-}" only_office_plugin_url="${ONLYOFFICE_PLUGIN_URL:-}" -only_office_edusharing_plugin="${ONLYOFFICE_EDUSHARING_PLUGIN:-}" +only_office_edusharing_plugin="${ONLYOFFICE_EDUSHARING_PLUGIN:-false}" only_office_edusharing_plugin_label="${ONLYOFFICE_EDUSHARING_PLUGIN_LABEL:-}" only_office_edusharing_plugin_icon="${ONLYOFFICE_EDUSHARING_PLUGIN_ICON:-}" only_office_jwt_secret="${ONLYOFFICE_JWT_SECRET:-}"