diff --git a/abra-entrypoint.sh b/abra-entrypoint.sh index 08f9d00..90fcc0b 100644 --- a/abra-entrypoint.sh +++ b/abra-entrypoint.sh @@ -8,7 +8,6 @@ set -e [ -f /run/secrets/django_sp ] && export DJANGO_SUPERUSER_PASSWORD="$(cat /run/secrets/django_sp)" [ -f /run/secrets/oidc_rpcs ] && export OIDC_RP_CLIENT_SECRET="$(cat /run/secrets/oidc_rpcs)" [ -f /run/secrets/email_pass ] && export DJANGO_EMAIL_HOST_PASSWORD="$(cat /run/secrets/email_pass)" -[ -f /run/secrets/collabora_p ] && export password="$(cat /run/secrets/collabora_p)" # if not in "env" mode, then execute the original entrypoint and command if [ ! "$1" = "-e" ]; then diff --git a/abra.sh b/abra.sh index f43480f..321e7b5 100755 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ # Set any config versions here # Docs: https://docs.coopcloud.tech/maintainers/handbook/#manage-configs -export ABRA_ENTRYPOINT_VERSION=v10 +export ABRA_ENTRYPOINT_VERSION=v11 export NGINX_CONF_VERSION=v6 export ONLYOFFICE_CONF_VERSION=v2 export PG_BACKUP_VERSION=v3 diff --git a/compose.yml b/compose.yml index dac8b20..1bf6236 100644 --- a/compose.yml +++ b/compose.yml @@ -283,7 +283,10 @@ services: collabora: image: collabora/code:25.04.9.1.1 - entrypoint: ["/abra-entrypoint.sh", "/start-collabora-online.sh"] + entrypoint: > + sh -c " + export password=\"$$(cat /run/secrets/collabora_p)\" && + exec /start-collabora-online.sh" healthcheck: test: [ "CMD", "curl", "-f", "http://localhost:9980/hosting/discovery" ] interval: 30s @@ -297,10 +300,6 @@ services: - extra_params=--o:ssl.enable=false --o:ssl.termination=true - username=${COLLABORA_ADMIN_USERNAME:-admin} - server_name=${COLLABORA_DOMAIN} - configs: - - source: abra_entrypoint - target: /abra-entrypoint.sh - mode: 0555 secrets: - collabora_p deploy: diff --git a/release/0.7.0+v0.12.0 b/release/0.7.0+v0.12.0 index a2b5bbe..50e0615 100644 --- a/release/0.7.0+v0.12.0 +++ b/release/0.7.0+v0.12.0 @@ -3,6 +3,7 @@ After upgrading, you must generate the new secret for collabora to work: ``` -abra app secret insert collabora_p v1 +abra app secret generate collabora_p +abra app config # set SECRET_COLLABORA_P_VERSION=v1 ```