diff --git a/changelog/unreleased/update_ocis_full.md b/changelog/unreleased/update_ocis_full.md new file mode 100644 index 00000000000..95b5c01c822 --- /dev/null +++ b/changelog/unreleased/update_ocis_full.md @@ -0,0 +1,5 @@ +Enhancement: Update the ocis_full deployment example + +Fix description texts, move image versions from yaml to .env where applicapable + +https://github.com/owncloud/ocis/pull/11666 diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index f4acdd16f13..25b1afdbcd5 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -10,6 +10,8 @@ INSECURE=true ## Traefik Settings ## # Note: Traefik is always enabled and can't be disabled. +# The recommended (and tested) version to pull. If no version is used, it pulls "latest" +TRAEFIK_DOCKER_TAG=v3.5.2 # Serve Traefik dashboard. # Defaults to "false". TRAEFIK_DASHBOARD= @@ -39,7 +41,7 @@ OCIS=:ocis.yml # For production releases: "owncloud/ocis" # For rolling releases: "owncloud/ocis-rolling" # Defaults to production if not set otherwise -OCIS_DOCKER_IMAGE=owncloud/ocis-rolling +OCIS_DOCKER_IMAGE=owncloud/ocis # The oCIS container version. # Defaults to "latest" and points to the latest stable tag. OCIS_DOCKER_TAG= @@ -174,6 +176,8 @@ TIKA_IMAGE= # Collabora web office is default enabled, comment if not required. # Note: the leading colon is required to enable the service. COLLABORA=:collabora.yml +# The recommended (and tested) version to pull. If no version is used, it pulls "latest" +COLLABORA_DOCKER_TAG=25.04.5.2.1 # Domain of Collabora, where you can find the frontend. # Defaults to "collabora.owncloud.test" COLLABORA_DOMAIN= @@ -217,18 +221,22 @@ CLAMAV_DOCKER_TAG= ### OnlyOffice Settings ### # Note: the leading colon is required to enable the service. #ONLYOFFICE=:onlyoffice.yml +# The OnlyOffice container image. +# For community releases: "onlyoffice/documentserver" +# For enterprise releases: "onlyoffice/documentserver-ee" +# Defaults to community if not set otherwise +ONLYOFFICE_IMAGE=onlyoffice/documentserver +# The recommended (and tested) version to pull. If no version is used, it pulls "latest" +ONLYOFFICE_DOCKER_TAG=9.0.4.1 +# EE only: path to your license on the host. +# Note that you need to additionally uncomment one line in onlyoffice.yml/volumes +#ONLYOFFICE_LICENSE_LOCAL=./config/onlyoffice/license.lic # Domain for OnlyOffice. Defaults to "onlyoffice.owncloud.test". ONLYOFFICE_DOMAIN= -# Set onlyoffice/documentserver-ee to use the Enterprise Edition. -#ONLYOFFICE_IMAGE=onlyoffice/documentserver-ee -# Defaults to "latest". Optional: pin a version (recommended) -ONLYOFFICE_DOCKER_TAG= # Runtime env (works for both; EE typically wants these). #ONLYOFFICE_JWT_ENABLED=false #ONLYOFFICE_REDIS_HOST=localhost #ONLYOFFICE_REDIS_PORT=6379 -# EE only: path to your license on the host. -#ONLYOFFICE_LICENSE_LOCAL=./config/onlyoffice/license.lic ### Mail Server Settings ### diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml index 0ca7d7aa0cd..8b0523a9c78 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/ocis_full/collabora.yml @@ -49,7 +49,7 @@ services: restart: always collabora: - image: collabora/code:25.04.4.2.1 + image: collabora/code:${COLLABORA_DOCKER_TAG:-latest} # release notes: https://www.collaboraonline.com/release-notes/ networks: ocis-net: diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/ocis_full/docker-compose.yml index cb03dca4699..1d60b6e628e 100644 --- a/deployments/examples/ocis_full/docker-compose.yml +++ b/deployments/examples/ocis_full/docker-compose.yml @@ -1,7 +1,7 @@ --- services: traefik: - image: traefik:v3.5.0 + image: traefik:${TRAEFIK_DOCKER_TAG:-latest} # release notes: https://github.com/traefik/traefik/releases networks: ocis-net: diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml index 871371ddfb9..cd3657a1309 100644 --- a/deployments/examples/ocis_full/onlyoffice.yml +++ b/deployments/examples/ocis_full/onlyoffice.yml @@ -44,8 +44,7 @@ services: restart: always onlyoffice: - # if you want to use oo enterprise edition, use: onlyoffice/documentserver-ee: - # note, you also need to add a volume, see below + # note, you also need to add a volume when using the enterprise version, see below image: ${ONLYOFFICE_IMAGE:-onlyoffice/documentserver}:${ONLYOFFICE_DOCKER_TAG:-latest} # changelog https://github.com/ONLYOFFICE/DocumentServer/releases networks: