mirror of
https://github.com/opencloud-eu/opencloud-compose.git
synced 2026-06-08 12:10:05 +08:00
Compare commits
1 Commits
29749588de
...
web/issues
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34801789f6 |
14
.env.example
14
.env.example
@@ -85,7 +85,7 @@ TRAEFIK_LOG_LEVEL=
|
||||
# Defaults to production if not set otherwise
|
||||
OC_DOCKER_IMAGE=opencloudeu/opencloud-rolling
|
||||
# The openCloud container version.
|
||||
# Defaults to the latest version-tag. Use git pull to update.
|
||||
# Defaults to "latest" and points to the latest stable tag.
|
||||
OC_DOCKER_TAG=
|
||||
# The default id used in opencloud containers is 1000 for user and group.
|
||||
# If you want to change the default, use the following variable and the format [UID]:[GID].
|
||||
@@ -330,18 +330,6 @@ KC_DB_USERNAME=
|
||||
# Keycloak Database password. Defaults to "keycloak".
|
||||
KC_DB_PASSWORD=
|
||||
|
||||
## Demo Users ##
|
||||
# Enable demo users and groups in the shared LDAP directory.
|
||||
# To enable, create custom/ldap-keycloak-demo-users.yml with:
|
||||
# services:
|
||||
# ldap-server:
|
||||
# volumes:
|
||||
# - ./config/ldap/ldif/30_demo_users.ldif:/ldifs/30_demo_users.ldif
|
||||
# - ./config/ldap/ldif/40_demo_groups.ldif:/ldifs/40_demo_groups.ldif
|
||||
#
|
||||
# Then add it to: COMPOSE_FILE=docker-compose.yml:weboffice/collabora.yml:traefik/opencloud.yml:traefik/collabora.yml:idm/ldap-keycloak.yml:traefik/ldap-keycloak.yml:custom/ldap-keycloak-demo-users.yml
|
||||
# WARNING: Do not use in production.
|
||||
|
||||
### Radicale Setting ###
|
||||
# Radicale is a small open-source CalDAV (calendars, to-do lists) and CardDAV (contacts) server.
|
||||
# When enabled OpenCloud is configured as a reverse proxy for Radicale, providing all authenticated
|
||||
|
||||
@@ -23,6 +23,14 @@ add_arg "--entryPoints.https.address=:${TRAEFIK_PORT_HTTPS:-443}"
|
||||
add_arg "--entryPoints.https.transport.respondingTimeouts.readTimeout=12h"
|
||||
add_arg "--entryPoints.https.transport.respondingTimeouts.writeTimeout=12h"
|
||||
add_arg "--entryPoints.https.transport.respondingTimeouts.idleTimeout=3m"
|
||||
# allow encoded characters
|
||||
# required for WOPI/Collabora and file operations with supported encoded characters
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedSlash=true"
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedQuestionMark=true"
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedPercent=true"
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedSemicolon=true"
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedHash=true"
|
||||
add_arg "--entryPoints.https.http.encodedCharacters.allowEncodedBackSlash=true"
|
||||
# docker provider (get configuration from container labels)
|
||||
add_arg "--providers.docker.endpoint=unix:///var/run/docker.sock"
|
||||
add_arg "--providers.docker.exposedByDefault=false"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
---
|
||||
services:
|
||||
opencloud:
|
||||
# renovate: depName=opencloudeu/opencloud-rolling
|
||||
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-6.1.0}
|
||||
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-latest}
|
||||
# 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}
|
||||
|
||||
@@ -64,7 +64,7 @@ services:
|
||||
restart: always
|
||||
|
||||
postgres:
|
||||
image: postgres:17.9-alpine
|
||||
image: postgres:17-alpine
|
||||
networks:
|
||||
opencloud-net:
|
||||
volumes:
|
||||
@@ -78,7 +78,7 @@ services:
|
||||
restart: always
|
||||
|
||||
keycloak:
|
||||
image: quay.io/keycloak/keycloak:26.6.1
|
||||
image: quay.io/keycloak/keycloak:26.3.3
|
||||
networks:
|
||||
opencloud-net:
|
||||
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"platformAutomerge": true,
|
||||
"enabledManagers": ["docker-compose", "custom.regex"],
|
||||
"baseBranchPatterns": ["main", "stable-4.0"],
|
||||
"packageRules": [
|
||||
{
|
||||
"matchManagers": ["docker-compose", "custom.regex"],
|
||||
"labels": ["Type:Dependencies", "Bot:Renovate"]
|
||||
},
|
||||
{
|
||||
"matchManagers": ["docker-compose"],
|
||||
"matchUpdateTypes": ["patch"],
|
||||
"automerge": true
|
||||
},
|
||||
{
|
||||
"matchBaseBranches": ["stable-4.0"],
|
||||
"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=(?<depName>[^\\s]+)\\n\\s+image: \\$\\{[^}]+\\}:\\$\\{[^}]+-(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+)\\}"
|
||||
],
|
||||
"datasourceTemplate": "docker"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:17.9-alpine
|
||||
image: postgres:17-alpine
|
||||
networks:
|
||||
opencloud-net:
|
||||
volumes:
|
||||
@@ -15,7 +15,7 @@ services:
|
||||
restart: always
|
||||
|
||||
keycloak:
|
||||
image: quay.io/keycloak/keycloak:26.6.1
|
||||
image: quay.io/keycloak/keycloak:26.3.3
|
||||
networks:
|
||||
opencloud-net:
|
||||
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
||||
|
||||
@@ -13,7 +13,6 @@ services:
|
||||
- "traefik.http.routers.collaboration.rule=Host(`${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}`)"
|
||||
- "traefik.http.routers.collaboration.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
||||
- "traefik.http.routers.collaboration.service=collaboration"
|
||||
- "traefik.http.routers.collaboration.middlewares=hsts-header"
|
||||
- "traefik.http.services.collaboration.loadbalancer.server.port=9300"
|
||||
collabora:
|
||||
labels:
|
||||
@@ -22,5 +21,4 @@ services:
|
||||
- "traefik.http.routers.collabora.rule=Host(`${COLLABORA_DOMAIN:-collabora.opencloud.test}`)"
|
||||
- "traefik.http.routers.collabora.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
||||
- "traefik.http.routers.collabora.service=collabora"
|
||||
- "traefik.http.routers.collabora.middlewares=hsts-header"
|
||||
- "traefik.http.services.collabora.loadbalancer.server.port=9980"
|
||||
|
||||
@@ -12,5 +12,4 @@ services:
|
||||
- "traefik.http.routers.keycloak.rule=Host(`${KEYCLOAK_DOMAIN:-keycloak.opencloud.test}`)"
|
||||
- "traefik.http.routers.keycloak.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
||||
- "traefik.http.routers.keycloak.service=keycloak"
|
||||
- "traefik.http.routers.keycloak.middlewares=hsts-header"
|
||||
- "traefik.http.services.keycloak.loadbalancer.server.port=8080"
|
||||
|
||||
@@ -3,20 +3,13 @@ services:
|
||||
opencloud:
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
# define middleware here, to make sure its loaded with the first defined container (opencloud)
|
||||
# if defined in the traefik container with a disabled dashboard it won't be loaded fast enough
|
||||
- "traefik.http.middlewares.hsts-header.headers.stsSeconds=31536000"
|
||||
- "traefik.http.middlewares.hsts-header.headers.stsIncludeSubdomains=true"
|
||||
- "traefik.http.middlewares.hsts-header.headers.stsPreload=true"
|
||||
- "traefik.http.middlewares.hsts-header.headers.forceSTSHeader=true"
|
||||
- "traefik.http.routers.opencloud.entrypoints=https"
|
||||
- "traefik.http.routers.opencloud.rule=Host(`${OC_DOMAIN:-cloud.opencloud.test}`)"
|
||||
- "traefik.http.routers.opencloud.service=opencloud"
|
||||
- "traefik.http.routers.opencloud.middlewares=hsts-header"
|
||||
- "traefik.http.services.opencloud.loadbalancer.server.port=9200"
|
||||
- "traefik.http.routers.opencloud.${TRAEFIK_SERVICES_TLS_CONFIG}"
|
||||
traefik:
|
||||
image: traefik:v3.6.14
|
||||
image: traefik:v3.6.4
|
||||
# release notes: https://github.com/traefik/traefik/releases
|
||||
user: ${TRAEFIK_CONTAINER_UID_GID:-0:0}
|
||||
networks:
|
||||
|
||||
@@ -14,8 +14,7 @@ services:
|
||||
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"
|
||||
|
||||
collaboration:
|
||||
# renovate: depName=opencloudeu/opencloud-rolling
|
||||
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-6.1.0}
|
||||
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-latest}
|
||||
user: ${OC_CONTAINER_UID_GID:-1000:1000}
|
||||
networks:
|
||||
opencloud-net:
|
||||
@@ -49,7 +48,7 @@ services:
|
||||
restart: always
|
||||
|
||||
collabora:
|
||||
image: collabora/code:25.04.9.4.1
|
||||
image: collabora/code:25.04.7.1.1
|
||||
# release notes: https://www.collaboraonline.com/release-notes/
|
||||
networks:
|
||||
opencloud-net:
|
||||
@@ -67,10 +66,7 @@ services:
|
||||
username: ${COLLABORA_ADMIN_USER:-admin}
|
||||
password: ${COLLABORA_ADMIN_PASSWORD:-admin}
|
||||
cap_add:
|
||||
- SYS_ADMIN
|
||||
security_opt:
|
||||
- seccomp=unconfined
|
||||
- apparmor:unconfined
|
||||
- MKNOD
|
||||
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).
|
||||
|
||||
Reference in New Issue
Block a user