diff --git a/collabora/hooks/web_proxy-relation-joined b/collabora/hooks/web_proxy-relation-joined index 07b25d4..7fd2747 100755 --- a/collabora/hooks/web_proxy-relation-joined +++ b/collabora/hooks/web_proxy-relation-joined @@ -3,6 +3,8 @@ set -e URL=$(relation-get url) || exit 1 +DOMAIN=$(relation-get domain) || exit 1 + PROTO="${URL%%://*}" ssl_enable=true @@ -24,6 +26,6 @@ config-add "\ services: $MASTER_BASE_SERVICE_NAME: environment: - server_name: \"$URL\" + server_name: \"$DOMAIN\" extra_params: \"--o:ssl.enable=false --o:ssl.termination=${ssl_enable} \" " diff --git a/collabora/metadata.yml b/collabora/metadata.yml index 7af5a9d..41bf585 100644 --- a/collabora/metadata.yml +++ b/collabora/metadata.yml @@ -1,5 +1,5 @@ -# from: collabora/code:23.05.3.1.1 -docker-image: docker.0k.io/collabora:2305.3.1 +# from: collabora/code:23.05.9.4.1 +docker-image: docker.0k.io/collabora:2305.9.4 docker-compose: cap_add: