From 782f4f58eba493a9db36f025f90cbe69b59dbd8b Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Mon, 13 Apr 2026 03:41:39 +0000 Subject: [PATCH] Modify Files --- work/opencloud-compose/docker-compose.yml | 9 ++++++--- .../external-proxy/collabora-exposed.yml | 5 ++++- .../external-proxy/opencloud-exposed.yml | 11 +++++----- .../opencloud-compose/weboffice/collabora.yml | 20 ++++++++++++------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/work/opencloud-compose/docker-compose.yml b/work/opencloud-compose/docker-compose.yml index 2320ea8..39fee6f 100644 --- a/work/opencloud-compose/docker-compose.yml +++ b/work/opencloud-compose/docker-compose.yml @@ -1,8 +1,8 @@ ---- services: opencloud: # renovate: depName=opencloudeu/opencloud-rolling - image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-6.0.0} + image: + ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-6.0.0} # changelog: https://github.com/opencloud-eu/opencloud/tree/main/changelog # release notes: https://docs.opencloud.eu/opencloud_release_notes.html user: ${OC_CONTAINER_UID_GID:-1000:1000} @@ -17,7 +17,8 @@ services: environment: # enable services that are not started automatically OC_ADD_RUN_SERVICES: ${START_ADDITIONAL_SERVICES} - OC_URL: https://${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} + OC_URL: + https://${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} OC_LOG_LEVEL: ${LOG_LEVEL:-info} OC_LOG_COLOR: "${LOG_PRETTY:-false}" OC_LOG_PRETTY: "${LOG_PRETTY:-false}" @@ -67,6 +68,8 @@ services: driver: ${LOG_DRIVER:-local} restart: always + env_file: + - .env volumes: opencloud-config: opencloud-data: diff --git a/work/opencloud-compose/external-proxy/collabora-exposed.yml b/work/opencloud-compose/external-proxy/collabora-exposed.yml index a6bb388..68a7a2f 100644 --- a/work/opencloud-compose/external-proxy/collabora-exposed.yml +++ b/work/opencloud-compose/external-proxy/collabora-exposed.yml @@ -1,11 +1,14 @@ ---- # only expose the ports when you know what you are doing! services: collaboration: ports: # expose the wopi server on all interfaces - "0.0.0.0:9300:9300" + env_file: + - .env collabora: ports: # expose the collabora server on all interfaces - "0.0.0.0:9980:9980" + env_file: + - .env diff --git a/work/opencloud-compose/external-proxy/opencloud-exposed.yml b/work/opencloud-compose/external-proxy/opencloud-exposed.yml index 8e28f5c..4f24a54 100644 --- a/work/opencloud-compose/external-proxy/opencloud-exposed.yml +++ b/work/opencloud-compose/external-proxy/opencloud-exposed.yml @@ -1,10 +1,11 @@ ---- # only expose the ports when you know what you are doing! services: opencloud: - environment: + environment: # bind to all interfaces - PROXY_HTTP_ADDR: "0.0.0.0:9200" - ports: + PROXY_HTTP_ADDR: "0.0.0.0:9200" + ports: # expose the opencloud server on all interfaces - - "0.0.0.0:9200:9200" + - "0.0.0.0:9200:9200" + env_file: + - .env diff --git a/work/opencloud-compose/weboffice/collabora.yml b/work/opencloud-compose/weboffice/collabora.yml index 29b0753..75fcde5 100644 --- a/work/opencloud-compose/weboffice/collabora.yml +++ b/work/opencloud-compose/weboffice/collabora.yml @@ -12,6 +12,8 @@ services: FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.api.collaboration GRAPH_AVAILABLE_ROLES: "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6" + env_file: + - .env collaboration: # renovate: depName=opencloudeu/opencloud-rolling image: @@ -25,7 +27,7 @@ services: collabora: condition: service_healthy entrypoint: - - /bin/sh + - /bin/sh command: ["-c", "opencloud collaboration server"] environment: COLLABORATION_GRPC_ADDR: 0.0.0.0:9301 @@ -47,11 +49,13 @@ services: https://${OC_DOMAIN:-cloud.opencloud.test}${TRAEFIK_PORT_HTTPS:+:}${TRAEFIK_PORT_HTTPS:-} volumes: # configure the .env file to use own paths instead of docker internal volumes - - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud + - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud logging: driver: ${LOG_DRIVER:-local} restart: always + env_file: + - .env collabora: image: collabora/code:25.04.9.4.1 # release notes: https://www.collaboraonline.com/release-notes/ @@ -73,15 +77,15 @@ services: username: ${COLLABORA_ADMIN_USER:-admin} password: ${COLLABORA_ADMIN_PASSWORD:-admin} cap_add: - - SYS_ADMIN + - SYS_ADMIN security_opt: - - seccomp=unconfined - - apparmor:unconfined + - seccomp=unconfined + - apparmor:unconfined volumes: # Mount local TrueType fonts so the container can use system fonts # (e.g. Microsoft fonts like Arial, Calibri, Cambria by installing the `ttf-mscorefonts-installer` package). - - /usr/share/fonts/truetype:/usr/share/fonts/truetype/more:ro - - /usr/share/fonts/truetype:/opt/cool/systemplate/usr/share/fonts/truetype/more:ro + - /usr/share/fonts/truetype:/usr/share/fonts/truetype/more:ro + - /usr/share/fonts/truetype:/opt/cool/systemplate/usr/share/fonts/truetype/more:ro logging: driver: ${LOG_DRIVER:-local} restart: always @@ -92,3 +96,5 @@ services: interval: 15s timeout: 10s retries: 5 + env_file: + - .env