From adaea9eb3f4ab17506a55287cf4723649f587724 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Tue, 13 Aug 2024 15:11:01 +0200
Subject: [PATCH] deployments: Default to "ocis-rolling" for the ocis_full
 example for now

The example requires features that are not available in the production
releases yet. Also add some clarification statements to the docs.

Fixes: #9779
---
 deployments/examples/ocis_full/.env     | 2 +-
 deployments/examples/ocis_full/ocis.yml | 4 +++-
 docs/ocis/deployment/ocis_full.md       | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env
index fea625e8a..d44a8f0f7 100644
--- a/deployments/examples/ocis_full/.env
+++ b/deployments/examples/ocis_full/.env
@@ -38,7 +38,7 @@ OCIS=:ocis.yml
 # The oCIS container image.
 # For production releases: "owncloud/ocis"
 # For rolling releases:    "owncloud/ocis-rolling"
-# Defaults to "owncloud/ocis" (production)
+# Defaults to "owncloud/ocis-rolling" (rolling release)
 OCIS_DOCKER_IMAGE=
 # The oCIS container version.
 # Defaults to "latest" and points to the latest stable tag.
diff --git a/deployments/examples/ocis_full/ocis.yml b/deployments/examples/ocis_full/ocis.yml
index 6c257411a..66606e18f 100644
--- a/deployments/examples/ocis_full/ocis.yml
+++ b/deployments/examples/ocis_full/ocis.yml
@@ -6,7 +6,9 @@ services:
         aliases:
           - ${OCIS_DOMAIN:-ocis.owncloud.test}
   ocis:
-    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
+    # FIXME: move back to "owncloud/ocis:latest" once the collaboratoin service is
+    #   available in a production release
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis-rolling}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     entrypoint:
diff --git a/docs/ocis/deployment/ocis_full.md b/docs/ocis/deployment/ocis_full.md
index 290205fa4..ceb6ba8a5 100644
--- a/docs/ocis/deployment/ocis_full.md
+++ b/docs/ocis/deployment/ocis_full.md
@@ -113,7 +113,7 @@ See also [example server setup]({{< ref "preparing_server" >}})
   # The oCIS container image.
   # For production releases: "owncloud/ocis"
   # For rolling releases:    "owncloud/ocis-rolling"
-  # Defaults to "owncloud/ocis" (production)
+  # Defaults to "owncloud/ocis-rolling" (rolling release)
   OCIS_DOCKER_IMAGE=
   # The oCIS container version.
   # Defaults to "latest" and points to the latest stable tag.
@@ -238,10 +238,10 @@ See also [example server setup]({{< ref "preparing_server" >}})
   Traefik will issue certificates with LetsEncrypt and therefore you must set an email address in `TRAEFIK_ACME_MAIL=`.
 
   #### Infinite Scale Release and Version
-  By default oCIS will be started in the `latest` production version.
-  You can change it to use the oCIS rolling releases by setting `OCIS_DOCKER_IMAGE=owncloud/ocis-rolling`. This will always use the latest rolling release.
+  By default oCIS will be started in the `latest` rolling version. Please note that this deployment does currently not work with the 5.x productions releases.
+  The oCIS "collaboration" service, which is required by this deployment is not part of the 5.x releases.
 
-  If you want to use a specific version of oCIS, set the version to a dedicated tag like `OCIS_DOCKER_TAG=5.0.1`. Available  production versions can be found on [Docker Hub Production](https://hub.docker.com/r/owncloud/ocis/tags?page=1&ordering=last_updated) and available rolling releases can be found on [Docker Hub Rolling](https://hub.docker.com/r/owncloud/ocis-rolling/tags?page=1&ordering=last_updated)
+  If you want to use a specific version of oCIS, set the version to a dedicated tag like `OCIS_DOCKER_TAG=6.2.0`. The minimal required oCIS Version to run this deployment is 6.2.0. Available  production versions can be found on [Docker Hub Production](https://hub.docker.com/r/owncloud/ocis/tags?page=1&ordering=last_updated) and available rolling releases can be found on [Docker Hub Rolling](https://hub.docker.com/r/owncloud/ocis-rolling/tags?page=1&ordering=last_updated)
 
   {{< hint type=info title="oCIS Releases" >}}
   You can read more about the different oCIS releases in the [oCIS Release Lifecycle](../release_roadmap.md).