From 300fc4779b0cf61621434cee0bc9fe07b48cf47c Mon Sep 17 00:00:00 2001 From: "v.scharf" Date: Fri, 10 Jul 2026 09:39:48 +0200 Subject: [PATCH 1/4] fix: use docker image to production release on stable-7.2 --- .env.example | 2 +- docker-compose.yml | 9 +++++++-- renovate.json | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 0588b8e..2c0e4b5 100644 --- a/.env.example +++ b/.env.example @@ -87,7 +87,7 @@ TRAEFIK_LOG_LEVEL= # For production releases: "opencloudeu/opencloud" # For rolling releases: "opencloudeu/opencloud-rolling" # Defaults to production if not set otherwise -OC_DOCKER_IMAGE=opencloudeu/opencloud-rolling +OC_DOCKER_IMAGE=opencloudeu/opencloud # The openCloud container version. # Defaults to the latest version-tag. Use git pull to update. OC_DOCKER_TAG= diff --git a/docker-compose.yml b/docker-compose.yml index 291936a..928d7fa 100644 --- a/docker-compose.yml +++ b/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.2.0} + # renovate: depName=opencloudeu/opencloud + image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud}:${OC_DOCKER_TAG:-6.2.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} @@ -29,6 +29,10 @@ services: PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # demo users IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" + #STORAGE_USERS_DRIVER: "decomposed" + STORAGE_USERS_PURGE_TRASH_BIN_PROJECT_DELETE_BEFORE: "30s" + STORAGE_USERS_PURGE_TRASH_BIN_PERSONAL_DELETE_BEFORE: "30s" + # admin password IDM_ADMIN_PASSWORD: "${INITIAL_ADMIN_PASSWORD}" # email server (if configured) @@ -56,6 +60,7 @@ services: OC_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS: "${OC_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS:-1}" # default language for services/WebUI; defaults to English, language code (ISO 639-1, e.g. de, en, fr) OC_DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE} + OC_SHOW_USER_EMAIL_IN_RESULTS: true volumes: - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt diff --git a/renovate.json b/renovate.json index ed2496e..b918785 100644 --- a/renovate.json +++ b/renovate.json @@ -2,7 +2,7 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "platformAutomerge": true, "enabledManagers": ["docker-compose", "custom.regex"], - "baseBranchPatterns": ["main", "stable-4.0"], + "baseBranchPatterns": ["main", "stable-7.2"], "packageRules": [ { "matchManagers": ["docker-compose", "custom.regex"], @@ -14,7 +14,7 @@ "automerge": true }, { - "matchBaseBranches": ["stable-4.0"], + "matchBaseBranches": ["stable-7.2"], "matchUpdateTypes": ["major", "minor"], "enabled": false }, From cc1471e46736137c055454af0e29753ed487a4d9 Mon Sep 17 00:00:00 2001 From: "v.scharf" Date: Fri, 10 Jul 2026 09:43:07 +0200 Subject: [PATCH 2/4] fix: use docker image to production release on stable-7.2 --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 928d7fa..7fce84d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,9 +29,6 @@ services: PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # demo users IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" - #STORAGE_USERS_DRIVER: "decomposed" - STORAGE_USERS_PURGE_TRASH_BIN_PROJECT_DELETE_BEFORE: "30s" - STORAGE_USERS_PURGE_TRASH_BIN_PERSONAL_DELETE_BEFORE: "30s" # admin password IDM_ADMIN_PASSWORD: "${INITIAL_ADMIN_PASSWORD}" From 6d3a1f8c492f2571639ba68cb67c56f51085ae38 Mon Sep 17 00:00:00 2001 From: "v.scharf" Date: Fri, 10 Jul 2026 09:49:34 +0200 Subject: [PATCH 3/4] remove renovate from stable-7.2 --- docker-compose.yml | 3 --- renovate.json | 43 ------------------------------------------- 2 files changed, 46 deletions(-) delete mode 100644 renovate.json diff --git a/docker-compose.yml b/docker-compose.yml index 7fce84d..ff63930 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ --- services: opencloud: - # renovate: depName=opencloudeu/opencloud image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud}:${OC_DOCKER_TAG:-6.2.0} # changelog: https://github.com/opencloud-eu/opencloud/tree/main/changelog # release notes: https://docs.opencloud.eu/opencloud_release_notes.html @@ -29,7 +28,6 @@ services: PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # demo users IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" - # admin password IDM_ADMIN_PASSWORD: "${INITIAL_ADMIN_PASSWORD}" # email server (if configured) @@ -57,7 +55,6 @@ services: OC_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS: "${OC_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS:-1}" # default language for services/WebUI; defaults to English, language code (ISO 639-1, e.g. de, en, fr) OC_DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE} - OC_SHOW_USER_EMAIL_IN_RESULTS: true volumes: - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt diff --git a/renovate.json b/renovate.json deleted file mode 100644 index b918785..0000000 --- a/renovate.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "platformAutomerge": true, - "enabledManagers": ["docker-compose", "custom.regex"], - "baseBranchPatterns": ["main", "stable-7.2"], - "packageRules": [ - { - "matchManagers": ["docker-compose", "custom.regex"], - "labels": ["Type:Dependencies", "Bot:Renovate"] - }, - { - "matchManagers": ["docker-compose"], - "matchUpdateTypes": ["patch"], - "automerge": true - }, - { - "matchBaseBranches": ["stable-7.2"], - "matchUpdateTypes": ["major", "minor"], - "enabled": false - }, - { - "matchPackageNames": ["postgres"], - "matchManagers": ["docker-compose"], - "allowedVersions": "/^17\\.\\d+-alpine$/" - } - ], - "docker-compose": { - "managerFilePatterns": ["/.+\\.ya?ml$/"] - }, - "customManagers": [ - { - "customType": "regex", - "managerFilePatterns": [ - "/^docker-compose\\.yml$/", - "/^weboffice\\/collabora\\.yml$/" - ], - "matchStrings": [ - "# renovate: depName=(?[^\\s]+)\\n\\s+image: \\$\\{[^}]+\\}:\\$\\{[^}]+-(?[0-9]+\\.[0-9]+\\.[0-9]+)\\}" - ], - "datasourceTemplate": "docker" - } - ] -} From 2c72369d2467af02197b5833192f7eb47382cb9c Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Fri, 10 Jul 2026 10:03:01 +0200 Subject: [PATCH 4/4] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ff63930..a70008f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ --- services: opencloud: - image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud}:${OC_DOCKER_TAG:-6.2.0} + image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud}:${OC_DOCKER_TAG:-7.2.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}