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 },