Merge pull request #9442 from owncloud/full-deployment

✨ [docs-only] feat: create ocis_full compose deployment
owncloud · Jun 28, 2024 · eb5a9ce · eb5a9ce
2 parents 4196b66 + 08061f5
commit eb5a9ce
Show file tree

Hide file tree

Showing 45 changed files with 1,068 additions and 1,407 deletions.
diff --git a/...deployment-config/ocis_traefik/latest.yml → ...us-deployment-config/ocis_full/master.yml b/...deployment-config/ocis_traefik/latest.yml → ...us-deployment-config/ocis_full/master.yml
@@ -1,5 +1,5 @@
 ---
-- name: continuous-deployment-ocis-traefik-latest
+- name: continuous-deployment-ocis-master
   server:
     server_type: cx21
     image: ubuntu-22.04
@@ -14,7 +14,7 @@
       - /var/lib/docker/volumes/ocis_certs
 
   domains:
-    - "*.ocis-traefik.latest.owncloud.works"
+    - "*.ocis.master.owncloud.works"
 
   vars:
     ssh_authorized_keys:
@@ -28,22 +28,26 @@
       - name: ocis
         git_url: https://github.com/owncloud/ocis.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_traefik
+        docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
-          OCIS_DOCKER_TAG: latest
-          OCIS_DOMAIN: ocis.ocis-traefik.latest.owncloud.works
+          OCIS_DOCKER_TAG: master
+          OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
+          OCIS_DOMAIN: ocis.ocis.master.owncloud.works
+          COMPANION_DOMAIN: companion.ocis.master.owncloud.works
+          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
+          WOPISERVER_DOMAIN: wopiserver.ocis.master.owncloud.works
+          COLLABORA_DOMAIN: collabora.ocis.master.owncloud.works
           DEMO_USERS: "true"
-          INBUCKET_DOMAIN: mail.ocis-traefik.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.master.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
-          OCIS_URL: ocis.ocis-traefik.latest.owncloud.works
-          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-traefik-latest
+          TELEGRAF_SPECIFIC_CONFIG: ocis_full
+          OCIS_URL: ocis.ocis.master.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-master
diff --git a/...ployment-config/ocis_traefik/released.yml → ...eployment-config/ocis_full/production.yml b/...ployment-config/ocis_traefik/released.yml → ...eployment-config/ocis_full/production.yml
@@ -1,5 +1,5 @@
 ---
-- name: continuous-deployment-ocis-traefik-released
+- name: continuous-deployment-ocis-production
   server:
     server_type: cx21
     image: ubuntu-22.04
@@ -14,7 +14,7 @@
       - /var/lib/docker/volumes/ocis_certs
 
   domains:
-    - "*.ocis-traefik.released.owncloud.works"
+    - "*.ocis.production.owncloud.works"
 
   vars:
     ssh_authorized_keys:
@@ -27,23 +27,27 @@
     docker_compose_projects:
       - name: ocis
         git_url: https://github.com/owncloud/ocis.git
-        ref: master
-        docker_compose_path: deployments/examples/ocis_traefik
+        ref: stable-5.0
+        docker_compose_path: deployments/examples/ocis_wopi
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
-          OCIS_DOCKER_TAG: 5.0.3
-          OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
+          OCIS_DOCKER_TAG: 5.0.5
+          OCIS_DOMAIN: ocis.ocis.production.owncloud.works
+          COMPANION_DOMAIN: companion.ocis.production.owncloud.works
+          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
+          WOPISERVER_DOMAIN: wopiserver.ocis.production.owncloud.works
+          COLLABORA_DOMAIN: collabora.ocis.production.owncloud.works
+          ONLYOFFICE_DOMAIN: onlyoffice.ocis.production.owncloud.works
           DEMO_USERS: "true"
-          INBUCKET_DOMAIN: mail.ocis-traefik.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.production.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
-          OCIS_URL: ocis.ocis-traefik.released.owncloud.works
-          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-traefik-released
+          TELEGRAF_SPECIFIC_CONFIG: ocis_wopi
+          OCIS_URL: ocis.ocis.production.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-production
diff --git a/...-deployment-config/ocis_traefik/daily.yml → ...s-deployment-config/ocis_full/rolling.yml b/...-deployment-config/ocis_traefik/daily.yml → ...s-deployment-config/ocis_full/rolling.yml
@@ -1,5 +1,5 @@
 ---
-- name: continuous-deployment-ocis-traefik-daily
+- name: continuous-deployment-ocis-rolling
   server:
     server_type: cx21
     image: ubuntu-22.04
@@ -14,7 +14,7 @@
       - /var/lib/docker/volumes/ocis_certs
 
   domains:
-    - "*.ocis-traefik.daily.owncloud.works"
+    - "*.ocis.rolling.owncloud.works"
 
   vars:
     ssh_authorized_keys:
@@ -28,22 +28,26 @@
       - name: ocis
         git_url: https://github.com/owncloud/ocis.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_traefik
+        docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OCIS_DOCKER_TAG: latest
-          OCIS_DOMAIN: ocis.ocis-traefik.daily.owncloud.works
+          OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
+          OCIS_DOMAIN: ocis.ocis.rolling.owncloud.works
+          COMPANION_DOMAIN: companion.ocis.rolling.owncloud.works
+          COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
+          WOPISERVER_DOMAIN: wopiserver.ocis.rolling.owncloud.works
+          COLLABORA_DOMAIN: collabora.ocis.rolling.owncloud.works
           DEMO_USERS: "true"
-          INBUCKET_DOMAIN: mail.ocis-traefik.daily.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.daily.owncloud.works
+          TELEMETRY_SERVE_DOMAIN: telemetry.ocis.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
-          OCIS_URL: ocis.ocis-traefik.daily.owncloud.works
-          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-traefik-daily
+          TELEGRAF_SPECIFIC_CONFIG: ocis_full
+          OCIS_URL: ocis.ocis.rolling.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-rolling
diff --git a/deployments/continuous-deployment-config/ocis_s3/latest.yml b/deployments/continuous-deployment-config/ocis_s3/latest.yml
diff --git a/deployments/examples/ocis_clamav/README.md b/deployments/examples/ocis_clamav/README.md
diff --git a/deployments/examples/ocis_clamav/docker-compose.yml b/deployments/examples/ocis_clamav/docker-compose.yml