From 2de32638e14a32dabb877fddffddd2fa60fdff3a Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 1 Jul 2024 13:23:11 +0200 Subject: [PATCH] feat: change the docs to reflect the new deployments --- docs/ocis/deployment/continuous_deployment.md | 99 ++++++++----------- 1 file changed, 39 insertions(+), 60 deletions(-) diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md index a0979cce9..6ecb6156d 100644 --- a/docs/ocis/deployment/continuous_deployment.md +++ b/docs/ocis/deployment/continuous_deployment.md @@ -11,67 +11,50 @@ geekdocFilePath: continuous_deployment.md We are continuously deploying the following deployment examples. Every example is deployed in two flavors: -- Latest: reflects the current master branch state of oCIS and will be updated with every commit to master -- Daily: reflects the master branch state of oCIS as of the time of deployment -- Released: reflects the newest release state (currently latest release of version 1) and will be updated with every release +- Master: reflects the current master branch state of oCIS and will be updated with every commit to master +- Rolling: reflects the latest rolling release of oCIS and will be updated with every rolling release +- Production: reflects the latest production release of oCIS and will be updated with every production release The configuration for the continuous deployment can be found in the [oCIS repository](https://github.com/owncloud/ocis/tree/master/deployments/continuous-deployment-config). -# oCIS with Traefik +# oCIS with Web Office + +This deployment is based on our modular [ocis_full Example](ocis_full.md) and uses the default configuration with Collabora Online as the office suite, traefik reverse proxy, cloudimporter and the inbucket mail catching server to showcase the full feature set of oCIS. Credentials: - oCIS: see [default demo users]({{< ref "../getting-started#login-to-owncloud-web" >}}) -## Latest +## Master -- oCIS: [ocis.ocis-traefik.latest.owncloud.works](https://ocis.ocis-traefik.latest.owncloud.works) -- Mail: [mail.ocis-traefik.latest.owncloud.works](https://mail.ocis-traefik.latest.owncloud.works) +- oCIS: [ocis.ocis.master.owncloud.works](https://ocis.ocis.master.owncloud.works) +- Mail: [mail.ocis.master.owncloud.works](https://mail.ocis.master.owncloud.works) -## Daily +## Rolling Release -- oCIS: [ocis.ocis-traefik.daily.owncloud.works](https://ocis.ocis-traefik.daily.owncloud.works) -- Mail: [mail.ocis-traefik.daily.owncloud.works](https://mail.ocis-traefik.daily.owncloud.works) +- oCIS: [ocis.ocis.rolling.owncloud.works](https://ocis.ocis.rolling.owncloud.works) +- Mail: [mail.ocis.rolling.owncloud.works](https://mail.ocis.rolling.owncloud.works) -## Released +## Production Release -- oCIS: [ocis.ocis-traefik.released.owncloud.works](https://ocis.ocis-traefik.released.owncloud.works) -- Mail: [mail.ocis-traefik.released.owncloud.works](https://mail.ocis-traefik.released.owncloud.works) +- oCIS: [ocis.ocis.production.owncloud.works](https://ocis.ocis.production.owncloud.works) +- Mail: [mail.ocis.production.owncloud.works](https://mail.ocis.production.owncloud.works) -# oCIS with WOPI server +## Rolling Release with OnlyOffice + +This example is based on the [ocis_full Example](ocis_full.md) and uses the default configuration with OnlyOffice as the office suite. + +- oCIS: [ocis.ocis-onlyoffice.rolling.owncloud.works](https://ocis.ocis-onlyoffice.rolling.owncloud.works) + +# oCIS and ownCloud Web with both most recent development versions Credentials: - oCIS: see [default demo users]({{< ref "../getting-started#login-to-owncloud-web" >}}) -## Latest +## Master branches -- oCIS: [ocis.ocis-wopi.latest.owncloud.works](https://ocis.ocis-wopi.latest.owncloud.works) -- Mail: [mail.ocis-wopi.latest.owncloud.works](https://mail.ocis-wopi.latest.owncloud.works) - -## Daily - -- oCIS: [ocis.ocis-wopi.daily.owncloud.works](https://ocis.ocis-wopi.daily.owncloud.works) -- Mail: [mail.ocis-wopi.daily.owncloud.works](https://mail.ocis-wopi.daily.owncloud.works) - -## Released - -- oCIS: [ocis.ocis-wopi.released.owncloud.works](https://ocis.ocis-wopi.released.owncloud.works) -- Mail: [mail.ocis-wopi.released.owncloud.works](https://mail.ocis-wopi.released.owncloud.works) - -# oCIS with latest ownCloud Web - -Credentials: - -- oCIS: see [default demo users]({{< ref "../getting-started#login-to-owncloud-web" >}}) - -## Latest - -- oCIS: [ocis.ocis-web.latest.owncloud.works](https://ocis.ocis-web.latest.owncloud.works) - -## Daily - -- oCIS: [ocis.ocis-web.daily.owncloud.works](https://ocis.ocis-web.daily.owncloud.works) +- oCIS: [ocis.ocis-web.master.owncloud.works](https://ocis.ocis-web.master.owncloud.works) # oCIS with Keycloak @@ -82,20 +65,19 @@ Credentials: - username: admin - password: admin -## Latest +## Rolling Release -- oCIS: [ocis.ocis-keycloak.latest.owncloud.works](https://ocis.ocis-keycloak.latest.owncloud.works) -- Keycloak admin access: [keycloak.ocis-keycloak.latest.owncloud.works](https://keycloak.ocis-keycloak.latest.owncloud.works) -- Keycloak account management: [keycloak.ocis-keycloak.latest.owncloud.works/realms/oCIS/account/#/](https://keycloak.ocis-keycloak.latest.owncloud.works/realms/oCIS/account/#/) +- oCIS: [ocis.ocis-keycloak.rolling.owncloud.works](https://ocis.ocis-keycloak.rolling.owncloud.works) +- Keycloak admin access: [keycloak.ocis-keycloak.rolling.owncloud.works](https://keycloak.ocis-keycloak.rolling.owncloud.works) +- Keycloak account management: [keycloak.ocis-keycloak.rolling.owncloud.works/realms/oCIS/account/#/](https://keycloak.ocis-keycloak.rolling.owncloud.works/realms/oCIS/account/#/) -## Released - -- oCIS: [ocis.ocis-keycloak.released.owncloud.works](https://ocis.ocis-keycloak.released.owncloud.works) -- Keycloak: [keycloak.ocis-keycloak.released.owncloud.works](https://keycloak.ocis-keycloak.released.owncloud.works) -- Keycloak account management: [keycloak.ocis-keycloak.released.owncloud.works/realms/oCIS/account/#/](https://keycloak.ocis-keycloak.released.owncloud.works/realms/oCIS/account/#/) # oCIS with S3 storage backend (MinIO) +This deployment is based on our modular [ocis_full Example](ocis_full.md), see the [oCIS with Web Office](#ocis-with-web-office) description for the feature set. In addition to that, we deployed a MinIO S3 storage backend. oCIS stores the data in the S3 server and the metadata on the local disk by using the `s3ng` storage driver. + +The MinIO server provides a powerful Web UI for browser-based access to the storage which makes it possible to manage the data stored in the S3 server and understand how different policies and configurations affect the data. + Credentials: - oCIS: see [default demo users]({{< ref "../getting-started/demo-users/" >}}) @@ -103,10 +85,11 @@ Credentials: - access key: ocis - secret access key: ocis-secret-key -## Latest +## Rolling Release -- oCIS: [ocis.ocis-s3.latest.owncloud.works](https://ocis.ocis-s3.latest.owncloud.works) -- MinIO: [minio.ocis-s3.latest.owncloud.works](https://minio.ocis-s3.latest.owncloud.works) +- oCIS: [ocis.ocis-s3.rolling.owncloud.works](https://ocis.ocis-s3.rolling.owncloud.works) +- MinIO: [minio.ocis-s3.rolling.owncloud.works](https://minio.ocis-s3.rolling.owncloud.works) +- Mail: [mail.ocis-s3.rolling.owncloud.works](https://mail.ocis-s3.rolling.owncloud.works) # oCIS with LDAP for users and groups @@ -117,12 +100,8 @@ Credentials: - username: cn=admin,dc=owncloud,dc=com - password: admin -## Latest +## Rolling Release -- oCIS: [ocis.ocis-ldap.latest.owncloud.works](https://ocis.ocis-ldap.latest.owncloud.works) -- LDAP admin: [ldap.ocis-ldap.latest.owncloud.works](https://ldap.ocis-ldap.latest.owncloud.works) +- oCIS: [ocis.ocis-ldap.rolling.owncloud.works](https://ocis.ocis-ldap.rolling.owncloud.works) +- LDAP admin: [ldap.ocis-ldap.rolling.owncloud.works](https://ldap.ocis-ldap.rolling.owncloud.works) -## Released - -- oCIS: [ocis.ocis-ldap.released.owncloud.works](https://ocis.ocis-ldap.released.owncloud.works) -- LDAP admin: [ldap.ocis-ldap.released.owncloud.works](https://ldap.ocis-ldap.released.owncloud.works)