From bc9734ec70934129eed4763743875d4d41282b1c Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 13 Aug 2024 12:09:04 +0200 Subject: [PATCH] [docs-only] Fix defaults for ocis container (production/release) --- deployments/examples/ocis_full/.env | 6 ++++-- docs/ocis/deployment/ocis_full.md | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index 54486316a6a..fea625e8a72 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -36,10 +36,12 @@ TRAEFIK_ACME_CASERVER= # Note: the leading colon is required to enable the service. OCIS=:ocis.yml # The oCIS container image. -# Defaults to "owncloud/ocis" which contains the production releases. +# For production releases: "owncloud/ocis" +# For rolling releases: "owncloud/ocis-rolling" +# Defaults to "owncloud/ocis" (production) OCIS_DOCKER_IMAGE= # The oCIS container version. -# Defaults to "latest". This will point to the latest stable tag. +# Defaults to "latest" and points to the latest stable tag. OCIS_DOCKER_TAG= # Domain of oCIS, where you can find the frontend. # Defaults to "ocis.owncloud.test" diff --git a/docs/ocis/deployment/ocis_full.md b/docs/ocis/deployment/ocis_full.md index fed35cd396f..290205fa4d8 100644 --- a/docs/ocis/deployment/ocis_full.md +++ b/docs/ocis/deployment/ocis_full.md @@ -72,7 +72,7 @@ See also [example server setup]({{< ref "preparing_server" >}}) The file by default looks like this: - ```shell {linenos=table,hl_lines=[8,24,46,48,133,136]} + ```shell {linenos=table,hl_lines=[8,24,48,50,135,138]} ## Basic Settings ## # Define the docker compose log driver used. # Defaults to local @@ -111,10 +111,12 @@ See also [example server setup]({{< ref "preparing_server" >}}) # Note: the leading colon is required to enable the service. OCIS=:ocis.yml # The oCIS container image. - # Defaults to "owncloud/ocis" which contains the production releases. + # For production releases: "owncloud/ocis" + # For rolling releases: "owncloud/ocis-rolling" + # Defaults to "owncloud/ocis" (production) OCIS_DOCKER_IMAGE= # The oCIS container version. - # Defaults to "latest". This will point to the latest stable tag. + # Defaults to "latest" and points to the latest stable tag. OCIS_DOCKER_TAG= # Domain of oCIS, where you can find the frontend. # Defaults to "ocis.owncloud.test"