From d01e629c0e368d457759998ecdbb6c7c0c6f9e33 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 2 Feb 2021 10:36:07 +0100 Subject: [PATCH 1/2] document and fix continuous deployment --- .../cs3_users_ocis/latest.yml | 4 +- .../cs3_users_ocis/released.yml | 4 +- .../ocis_keycloak/released.yml | 2 +- docs/ocis/deployment/continuous_deployment.md | 65 +++++++++++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 docs/ocis/deployment/continuous_deployment.md diff --git a/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml b/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml index d8cee1a5a4..407209264d 100644 --- a/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml +++ b/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml @@ -25,14 +25,14 @@ TRAEFIK_ACME_MAIL: wkloucek@owncloud.com OCIS_DOCKER_TAG: latest OCIS_DOMAIN: ocis.ocis-cs3-users.latest.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-keycloak.released.owncloud.works + LDAP_MANAGER_DOMAIN: ldap.ocis-cs3-users.latest.owncloud.works COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master env: NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-traefik.latest.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-cs3-users.latest.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container OCIS_URL: ocis.ocis-cs3-users.latest.owncloud.works diff --git a/deployments/continuous-deployment-config/cs3_users_ocis/released.yml b/deployments/continuous-deployment-config/cs3_users_ocis/released.yml index 862bc636fe..fb9de39645 100644 --- a/deployments/continuous-deployment-config/cs3_users_ocis/released.yml +++ b/deployments/continuous-deployment-config/cs3_users_ocis/released.yml @@ -25,14 +25,14 @@ TRAEFIK_ACME_MAIL: wkloucek@owncloud.com OCIS_DOCKER_TAG: 1 OCIS_DOMAIN: ocis.ocis-cs3-users.released.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-keycloak.released.owncloud.works + LDAP_MANAGER_DOMAIN: ldap.ocis-cs3-users.released.owncloud.works COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master env: NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-traefik.released.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-cs3-users.released.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container OCIS_URL: ocis.ocis-cs3-users.released.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_keycloak/released.yml b/deployments/continuous-deployment-config/ocis_keycloak/released.yml index 3259bcdcf6..5d93d23e3e 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/released.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/released.yml @@ -25,7 +25,7 @@ TRAEFIK_ACME_MAIL: wkloucek@owncloud.com OCIS_DOCKER_TAG: 1 OCIS_DOMAIN: ocis.ocis-keycloak.released.owncloud.works - KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.latest.owncloud.works + KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md new file mode 100644 index 0000000000..a14e258841 --- /dev/null +++ b/docs/ocis/deployment/continuous_deployment.md @@ -0,0 +1,65 @@ +--- +title: "Continuous Deployment" +date: 2020-10-12T14:04:00+01:00 +weight: 10 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs/ocis/deployment +geekdocFilePath: continuous_deployment.md +--- + +{{< toc >}} + +We are continuously deploying 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 +- Released: reflects the newest release state (currently latest release of version 1) and will be updated with every 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 + +Credentials: +- oCIS: see [default demo users]({{< ref "../getting-started.md#login-to-owncloud-web" >}}) + +## Latest + +- oCIS: [ocis.ocis-traefik.latest.owncloud.works](https://ocis.ocis-traefik.latest.owncloud.works) + +## Released + +- oCIS: [ocis.ocis-traefik.released.owncloud.works](https://ocis.ocis-traefik.released.owncloud.works) + +# oCIS with Keycloak + +Credentials: +- oCIS: see [default demo users]({{< ref "../getting-started.md#login-to-owncloud-web" >}}) +- Keycloak: + - username: admin + - password: admin + +## Latest + +- oCIS: [ocis.ocis-keycloak.latest.owncloud.works](https://ocis.ocis-keycloak.latest.owncloud.works) +- Keycloak: [keycloak.ocis-keycloak.latest.owncloud.works](https://https://keycloak.ocis-keycloak.latest.owncloud.works) + +## Released + +- oCIS: [ocis.ocis-keycloak.released.owncloud.works](https://ocis.ocis-keycloak.released.owncloud.works) +- Keycloak: [keycloak.ocis-keycloak.latest.owncloud.works](https://keycloak.ocis-keycloak.latest.owncloud.works) + +# oCIS with CS3 users + +Credentials: +- oCIS: see [default demo users]({{< ref "../getting-started.md#login-to-owncloud-web" >}}) +- LDAP admin: + - username: cn=admin,dc=owncloud,dc=com + - password: admin + +## Latest + +- oCIS: [ocis.ocis-cs3-users.latest.owncloud.works](https://ocis.ocis-cs3-users.latest.owncloud.works) +- LDAP admin: [ldap.ocis-cs3-users.latest.owncloud.works](https://ldap.ocis-cs3-users.latest.owncloud.works) + +## Released + +- oCIS: [ocis.ocis-cs3-users.released.owncloud.works](https://ocis.ocis-cs3-users.released.owncloud.works) +- LDAP admin: [ldap.ocis-cs3-users.released.owncloud.works](https://ldap.ocis-cs3-users.released.owncloud.works) From 7fd1fef3f3065d6122c279f6c390fdc753ff6195 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 2 Feb 2021 18:02:45 +0545 Subject: [PATCH 2/2] Update docs/ocis/deployment/continuous_deployment.md --- docs/ocis/deployment/continuous_deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md index a14e258841..8a438f80e8 100644 --- a/docs/ocis/deployment/continuous_deployment.md +++ b/docs/ocis/deployment/continuous_deployment.md @@ -9,7 +9,7 @@ geekdocFilePath: continuous_deployment.md {{< toc >}} -We are continuously deploying following deployment examples. Every example is deployed in two flavors: +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 - Released: reflects the newest release state (currently latest release of version 1) and will be updated with every release