mirror of
https://github.com/opencloud-eu/opencloud-compose.git
synced 2026-10-07 11:28:15 +08:00
Compare commits
1 Commits
main
...
d0dfc33f41
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0dfc33f41 |
@@ -393,7 +393,7 @@ KC_DB_PASSWORD=
|
|||||||
# Docker image to use for the yjs container.
|
# Docker image to use for the yjs container.
|
||||||
#YJS_DOCKER_IMAGE=opencloudeu/yjs
|
#YJS_DOCKER_IMAGE=opencloudeu/yjs
|
||||||
# Docker tag to pull for the yjs container.
|
# Docker tag to pull for the yjs container.
|
||||||
#YJS_DOCKER_TAG=
|
#YJS_DOCKER_TAG=1.0.0
|
||||||
# URL the yjs server uses to reach OpenCloud. Defaults to "http://opencloud:9200".
|
# URL the yjs server uses to reach OpenCloud. Defaults to "http://opencloud:9200".
|
||||||
#YJS_OPENCLOUD_URL=
|
#YJS_OPENCLOUD_URL=
|
||||||
# Grace period in milliseconds for a graceful shutdown. Defaults to "15000".
|
# Grace period in milliseconds for a graceful shutdown. Defaults to "15000".
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
services:
|
services:
|
||||||
opencloud:
|
opencloud:
|
||||||
# renovate: depName=opencloudeu/opencloud-rolling
|
# renovate: depName=opencloudeu/opencloud-rolling
|
||||||
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-8.1.0}
|
image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-8.0.0}
|
||||||
# changelog: https://github.com/opencloud-eu/opencloud/tree/main/changelog
|
# changelog: https://github.com/opencloud-eu/opencloud/tree/main/changelog
|
||||||
# release notes: https://docs.opencloud.eu/opencloud_release_notes.html
|
# release notes: https://docs.opencloud.eu/opencloud_release_notes.html
|
||||||
user: ${OC_CONTAINER_UID_GID:-1000:1000}
|
user: ${OC_CONTAINER_UID_GID:-1000:1000}
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
keycloak:
|
keycloak:
|
||||||
image: quay.io/keycloak/keycloak:26.8.0
|
image: quay.io/keycloak/keycloak:26.7.3
|
||||||
networks:
|
networks:
|
||||||
opencloud-net:
|
opencloud-net:
|
||||||
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
||||||
|
|||||||
@@ -33,8 +33,7 @@
|
|||||||
"customType": "regex",
|
"customType": "regex",
|
||||||
"managerFilePatterns": [
|
"managerFilePatterns": [
|
||||||
"/^docker-compose\\.yml$/",
|
"/^docker-compose\\.yml$/",
|
||||||
"/^weboffice\\/collabora\\.yml$/",
|
"/^weboffice\\/collabora\\.yml$/"
|
||||||
"/^yjs\\/yjs\\.yml$/"
|
|
||||||
],
|
],
|
||||||
"matchStrings": [
|
"matchStrings": [
|
||||||
"# renovate: depName=(?<depName>[^\\s]+)\\n\\s+image: \\$\\{[^}]+\\}:\\$\\{[^}]+-(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+)\\}"
|
"# renovate: depName=(?<depName>[^\\s]+)\\n\\s+image: \\$\\{[^}]+\\}:\\$\\{[^}]+-(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+)\\}"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
keycloak:
|
keycloak:
|
||||||
image: quay.io/keycloak/keycloak:26.8.0
|
image: quay.io/keycloak/keycloak:26.7.3
|
||||||
networks:
|
networks:
|
||||||
opencloud-net:
|
opencloud-net:
|
||||||
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
command: [ "start", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm" ]
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
# To rotate the key, remove the volume and start again:
|
# To rotate the key, remove the volume and start again:
|
||||||
# docker compose down collabora && docker volume rm <project>_collabora-proof-key
|
# docker compose down collabora && docker volume rm <project>_collabora-proof-key
|
||||||
collabora-proof-key:
|
collabora-proof-key:
|
||||||
image: alpine/openssl:3.5.9
|
image: alpine/openssl:3.5.8
|
||||||
entrypoint: ["/bin/sh"]
|
entrypoint: ["/bin/sh"]
|
||||||
command:
|
command:
|
||||||
- -ec
|
- -ec
|
||||||
@@ -50,7 +50,7 @@ services:
|
|||||||
restart: "no"
|
restart: "no"
|
||||||
|
|
||||||
collabora:
|
collabora:
|
||||||
image: collabora/code:26.04.4.2.1
|
image: collabora/code:26.04.3.2.1
|
||||||
# release notes: https://www.collaboraonline.com/release-notes/
|
# release notes: https://www.collaboraonline.com/release-notes/
|
||||||
networks:
|
networks:
|
||||||
opencloud-net:
|
opencloud-net:
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ services:
|
|||||||
# the /yjs route is configured in the proxy
|
# the /yjs route is configured in the proxy
|
||||||
- ./config/opencloud/proxy.yaml:/etc/opencloud/proxy.yaml
|
- ./config/opencloud/proxy.yaml:/etc/opencloud/proxy.yaml
|
||||||
yjs:
|
yjs:
|
||||||
# renovate: depName=opencloudeu/yjs
|
image: ${YJS_DOCKER_IMAGE:-opencloudeu/yjs}:${YJS_DOCKER_TAG:-1.0.0}
|
||||||
image: ${YJS_DOCKER_IMAGE:-opencloudeu/yjs}:${YJS_DOCKER_TAG:-1.1.0}
|
|
||||||
user: ${OC_CONTAINER_UID_GID:-1000:1000}
|
user: ${OC_CONTAINER_UID_GID:-1000:1000}
|
||||||
networks:
|
networks:
|
||||||
opencloud-net:
|
opencloud-net:
|
||||||
|
|||||||
Reference in New Issue
Block a user