From e5f882e7f5c2bf1e0892c013b11eb061ba14f0cf Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Tue, 5 Nov 2024 22:26:02 +0100 Subject: [PATCH 1/2] feat: add ocis master deployment with OnlyOffice --- .drone.star | 1 + .../ocis_full/onlyoffice-master.yml | 54 +++++++++++++++++++ deployments/examples/ocis_full/onlyoffice.yml | 1 + 3 files changed, 56 insertions(+) create mode 100644 deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml diff --git a/.drone.star b/.drone.star index 75ef82289e..1a1dd0bd48 100644 --- a/.drone.star +++ b/.drone.star @@ -2270,6 +2270,7 @@ def skipIfUnchanged(ctx, type): def example_deploys(ctx): on_merge_deploy = [ "ocis_full/master.yml", + "ocis_full/onlyoffice-master.yml", ] nightly_deploy = [ "ocis_ldap/rolling.yml", diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml new file mode 100644 index 0000000000..98e140d092 --- /dev/null +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml @@ -0,0 +1,54 @@ +--- +- name: continuous-deployment-ocis-onlyoffice-master + server: + server_type: cx22 + image: ubuntu-24.04 + location: nbg1 + initial_ssh_key_names: + - owncloud-ocis@drone.owncloud.com + labels: + owner: ocis-team + for: oCIS-continuous-deployment-examples + rebuild: $REBUILD + rebuild_carry_paths: + - /var/lib/docker/volumes/ocis_certs + + domains: + - "*.ocis-onlyoffice.master.owncloud.works" + + vars: + ssh_authorized_keys: + - https://github.com/butonic.keys + - https://github.com/fschade.keys + - https://github.com/kulmann.keys + - https://github.com/micbar.keys + - https://github.com/rhafer.keys + - https://github.com/wkloucek.keys + docker_compose_projects: + - name: ocis + git_url: https://github.com/owncloud/ocis.git + ref: master + docker_compose_path: deployments/examples/ocis_full + env: + INSECURE: "false" + TRAEFIK_ACME_MAIL: mbarz@owncloud.com + OCIS_DOCKER_TAG: master + OCIS_DOCKER_IMAGE: owncloud/ocis-rolling + OCIS_DOMAIN: ocis.ocis-onlyoffice.master.owncloud.works + COMPANION_DOMAIN: companion.ocis-onlyoffice.master.owncloud.works + COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud + WOPISERVER_ONLYOFFICE_DOMAIN: wopiserver-oo.ocis-onlyoffice.master.owncloud.works + ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.master.owncloud.works + INBUCKET_DOMAIN: mail.ocis-onlyoffice.master.owncloud.works + DEMO_USERS: "true" + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring-oo.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-onlyoffice.master.owncloud.works + JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 + TELEGRAF_SPECIFIC_CONFIG: ocis_onlyoffice + OCIS_URL: ocis.ocis-onlyoffice.master.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-onlyoffice-master diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml index 5f7acdb1d4..0116070bfb 100644 --- a/deployments/examples/ocis_full/onlyoffice.yml +++ b/deployments/examples/ocis_full/onlyoffice.yml @@ -26,6 +26,7 @@ services: MICRO_REGISTRY_ADDRESS: "ocis:9233" COLLABORATION_WOPI_SRC: https://${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test} COLLABORATION_APP_NAME: "OnlyOffice" + COLLABORATION_APP_PRODUCT: "OnlyOffice" COLLABORATION_APP_ADDR: https://${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test} COLLABORATION_APP_ICON: https://${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test}/web-apps/apps/documenteditor/main/resources/img/favicon.ico COLLABORATION_APP_INSECURE: "${INSECURE:-true}" From 5b1631944abad04bad22e2835b8ee5c357e6f7b1 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 6 Nov 2024 05:30:43 +0100 Subject: [PATCH 2/2] docs: add master with onlyoffice to dev docs --- docs/ocis/deployment/continuous_deployment.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md index 6ecb6156d2..b146f8947c 100644 --- a/docs/ocis/deployment/continuous_deployment.md +++ b/docs/ocis/deployment/continuous_deployment.md @@ -40,9 +40,15 @@ Credentials: - oCIS: [ocis.ocis.production.owncloud.works](https://ocis.ocis.production.owncloud.works) - Mail: [mail.ocis.production.owncloud.works](https://mail.ocis.production.owncloud.works) +## Master with OnlyOffice + +This example is using OnlyOffice as the office suite. + +- oCIS: [ocis.ocis-onlyoffice.master.owncloud.works](https://ocis.ocis-onlyoffice.master.owncloud.works) + ## 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. +This example is using OnlyOffice as the office suite. - oCIS: [ocis.ocis-onlyoffice.rolling.owncloud.works](https://ocis.ocis-onlyoffice.rolling.owncloud.works)