From 0bcad8b5e187910e6017c9b1832778d37188bbcd Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 13:19:40 +0200 Subject: [PATCH 1/3] ci: bring up the new continous deployments --- .drone.star | 18 +-- .../ocis_full/master.yml | 3 +- .../onlyoffice-rolling.yml} | 29 ++-- .../ocis_full/production.yml | 3 +- .../ocis_full/rolling.yml | 3 +- .../daily.yml => ocis_full/s3-rolling.yml} | 30 ++-- .../ocis_keycloak/released.yml | 48 ------- .../ocis_keycloak/{latest.yml => rolling.yml} | 15 +- .../ocis_ldap/released.yml | 48 ------- .../ocis_ldap/{latest.yml => rolling.yml} | 15 +- .../ocis_wopi/released.yml | 54 ------- .../examples/ocis_keycloak/docker-compose.yml | 2 +- .../examples/ocis_ldap/docker-compose.yml | 2 +- deployments/examples/ocis_s3/.env | 39 ------ deployments/examples/ocis_s3/README.md | 6 - .../examples/ocis_s3/docker-compose.yml | 132 ------------------ .../docker-compose-additions.yml | 18 --- 17 files changed, 60 insertions(+), 405 deletions(-) rename deployments/continuous-deployment-config/{ocis_wopi/latest.yml => ocis_full/onlyoffice-rolling.yml} (54%) rename deployments/continuous-deployment-config/{ocis_wopi/daily.yml => ocis_full/s3-rolling.yml} (55%) delete mode 100644 deployments/continuous-deployment-config/ocis_keycloak/released.yml rename deployments/continuous-deployment-config/ocis_keycloak/{latest.yml => rolling.yml} (75%) delete mode 100644 deployments/continuous-deployment-config/ocis_ldap/released.yml rename deployments/continuous-deployment-config/ocis_ldap/{latest.yml => rolling.yml} (73%) delete mode 100644 deployments/continuous-deployment-config/ocis_wopi/released.yml delete mode 100644 deployments/examples/ocis_s3/.env delete mode 100644 deployments/examples/ocis_s3/README.md delete mode 100644 deployments/examples/ocis_s3/docker-compose.yml delete mode 100644 deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml diff --git a/.drone.star b/.drone.star index c8116afd1..4403dd7ba 100644 --- a/.drone.star +++ b/.drone.star @@ -2195,19 +2195,15 @@ def skipIfUnchanged(ctx, type): def example_deploys(ctx): on_merge_deploy = [ - "ocis_ldap/latest.yml", - "ocis_keycloak/latest.yml", - "ocis_traefik/latest.yml", - "ocis_wopi/latest.yml", - "ocis_s3/latest.yml", + "ocis_full/master.yml", ] nightly_deploy = [ - "ocis_ldap/released.yml", - "ocis_keycloak/released.yml", - "ocis_traefik/released.yml", - "ocis_wopi/released.yml", - "ocis_traefik/daily.yml", - "ocis_wopi/daily.yml", + "ocis_ldap/rolling.yml", + "ocis_keycloak/rolling.yml", + "ocis_full/production.yml", + "ocis_full/rolling.yml", + "ocis_full/onlyoffice-rolling.yml", + "ocis_full/s3-rolling.yml", ] # if on master branch: diff --git a/deployments/continuous-deployment-config/ocis_full/master.yml b/deployments/continuous-deployment-config/ocis_full/master.yml index b81811542..6f63f7881 100644 --- a/deployments/continuous-deployment-config/ocis_full/master.yml +++ b/deployments/continuous-deployment-config/ocis_full/master.yml @@ -39,8 +39,9 @@ COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud WOPISERVER_DOMAIN: wopiserver.ocis.master.owncloud.works COLLABORA_DOMAIN: collabora.ocis.master.owncloud.works + INBUCKET_DOMAIN: mail.ocis.master.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/deployments/continuous-deployment-config/ocis_wopi/latest.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml similarity index 54% rename from deployments/continuous-deployment-config/ocis_wopi/latest.yml rename to deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index 61a8c4052..a07d8a87d 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/latest.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-wopi-latest +- name: continuous-deployment-ocis-onlyoffice-rolling server: server_type: cx21 image: ubuntu-22.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-wopi.latest.owncloud.works" + - "*.ocis-onlyoffice.rolling.owncloud.works" vars: ssh_authorized_keys: @@ -28,28 +28,27 @@ - name: ocis git_url: https://github.com/owncloud/ocis.git ref: master - docker_compose_path: deployments/examples/ocis_wopi + docker_compose_path: deployments/examples/ocis_full env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-wopi.latest.owncloud.works - COMPANION_DOMAIN: companion.ocis-wopi.latest.owncloud.works - COMPANION_WEB_CONFIG_FILE_NAME: web-latest.yaml + OCIS_DOCKER_IMAGE: owncloud/ocis-rolling + OCIS_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works + COMPANION_DOMAIN: companion.ocis-onlyoffice.rolling.owncloud.works COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud - WOPISERVER_DOMAIN: wopiserver.ocis-wopi.latest.owncloud.works - COLLABORA_DOMAIN: collabora.ocis-wopi.latest.owncloud.works - ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.latest.owncloud.works - INBUCKET_DOMAIN: mail.ocis-wopi.latest.owncloud.works + WOPISERVER_DOMAIN: wopiserver.ocis-onlyoffice.rolling.owncloud.works + ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.rolling.owncloud.works + INBUCKET_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.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-wopi.latest.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-onlyoffice.rolling.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_wopi - OCIS_URL: ocis.ocis-wopi.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-wopi-latest + TELEGRAF_SPECIFIC_CONFIG: ocis_onlyoffice + OCIS_URL: ocis.ocis-onlyoffice.rolling.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-onlyoffice-rolling diff --git a/deployments/continuous-deployment-config/ocis_full/production.yml b/deployments/continuous-deployment-config/ocis_full/production.yml index 05d7e4f0f..0922d1f09 100644 --- a/deployments/continuous-deployment-config/ocis_full/production.yml +++ b/deployments/continuous-deployment-config/ocis_full/production.yml @@ -39,8 +39,9 @@ WOPISERVER_DOMAIN: wopiserver.ocis.production.owncloud.works COLLABORA_DOMAIN: collabora.ocis.production.owncloud.works ONLYOFFICE_DOMAIN: onlyoffice.ocis.production.owncloud.works + INBUCKET_DOMAIN: mail.ocis.production.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:cloudimporter.yml:inbucket.yml:monitoring.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml index 19af01bf2..7433b37d2 100644 --- a/deployments/continuous-deployment-config/ocis_full/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml @@ -39,8 +39,9 @@ COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud WOPISERVER_DOMAIN: wopiserver.ocis.rolling.owncloud.works COLLABORA_DOMAIN: collabora.ocis.rolling.owncloud.works + INBUCKET_DOMAIN: mail.ocis.rolling.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/deployments/continuous-deployment-config/ocis_wopi/daily.yml b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml similarity index 55% rename from deployments/continuous-deployment-config/ocis_wopi/daily.yml rename to deployments/continuous-deployment-config/ocis_full/s3-rolling.yml index afa7c4356..9fdf5b7b9 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/daily.yml +++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-wopi-daily +- name: continuous-deployment-ocis-s3-rolling server: server_type: cx21 image: ubuntu-22.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-wopi.daily.owncloud.works" + - "*.ocis-s3.rolling.owncloud.works" vars: ssh_authorized_keys: @@ -28,28 +28,28 @@ - name: ocis git_url: https://github.com/owncloud/ocis.git ref: master - docker_compose_path: deployments/examples/ocis_wopi + docker_compose_path: deployments/examples/ocis_full env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-wopi.daily.owncloud.works - COMPANION_DOMAIN: companion.ocis-wopi.daily.owncloud.works - COMPANION_WEB_CONFIG_FILE_NAME: web-daily.yaml + OCIS_DOCKER_IMAGE: owncloud/ocis-rolling + OCIS_DOMAIN: ocis.ocis-s3.rolling.owncloud.works + COMPANION_DOMAIN: companion.ocis-s3.rolling.owncloud.works COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud - WOPISERVER_DOMAIN: wopiserver.ocis-wopi.daily.owncloud.works - COLLABORA_DOMAIN: collabora.ocis-wopi.daily.owncloud.works - ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.daily.owncloud.works - INBUCKET_DOMAIN: mail.ocis-wopi.daily.owncloud.works + WOPISERVER_DOMAIN: wopiserver.ocis-s3.rolling.owncloud.works + COLLABORA_DOMAIN: collabora.ocis-s3.rolling.owncloud.works + INBUCKET_DOMAIN: mail.ocis-s3.rolling.owncloud.works + MINIO_DOMAIN: minio.ocis-s3.rolling.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:s3ng.yml:minio.yml:tika.yml:collabora.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.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-wopi.daily.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-s3.rolling.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_wopi - OCIS_URL: ocis.ocis-wopi.daily.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-wopi-daily + TELEGRAF_SPECIFIC_CONFIG: ocis_full + OCIS_URL: ocis.ocis-s3.rolling.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-s3-rolling diff --git a/deployments/continuous-deployment-config/ocis_keycloak/released.yml b/deployments/continuous-deployment-config/ocis_keycloak/released.yml deleted file mode 100644 index f614eefb2..000000000 --- a/deployments/continuous-deployment-config/ocis_keycloak/released.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -- name: continuous-deployment-ocis-keycloak-released - server: - server_type: cx21 - image: ubuntu-22.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-keycloak.released.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_keycloak - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 5.0.3 - OCIS_DOMAIN: ocis.ocis-keycloak.released.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 - ref: master - env: - NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-keycloak.released.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-keycloak.released.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-keycloak-released diff --git a/deployments/continuous-deployment-config/ocis_keycloak/latest.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml similarity index 75% rename from deployments/continuous-deployment-config/ocis_keycloak/latest.yml rename to deployments/continuous-deployment-config/ocis_keycloak/rolling.yml index 3f153ed9c..347814c36 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/latest.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-keycloak-latest +- name: continuous-deployment-ocis-keycloak-rolling server: server_type: cx21 image: ubuntu-22.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-keycloak.latest.owncloud.works" + - "*.ocis-keycloak.rolling.owncloud.works" vars: ssh_authorized_keys: @@ -33,16 +33,17 @@ INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-keycloak.latest.owncloud.works - KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.latest.owncloud.works + OCIS_DOCKER_IMAGE: owncloud/ocis-rolling + OCIS_DOMAIN: ocis.ocis-keycloak.rolling.owncloud.works + KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.rolling.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-keycloak.latest.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-keycloak.rolling.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-keycloak.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-keycloak-latest + OCIS_URL: ocis.ocis-keycloak.rolling.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-keycloak-rolling diff --git a/deployments/continuous-deployment-config/ocis_ldap/released.yml b/deployments/continuous-deployment-config/ocis_ldap/released.yml deleted file mode 100644 index e7883b9f5..000000000 --- a/deployments/continuous-deployment-config/ocis_ldap/released.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -- name: continuous-deployment-ocis-ldap-released - server: - server_type: cx21 - image: ubuntu-22.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-ldap.released.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_ldap - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 5.0.3 - OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.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-ldap.released.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-ldap.released.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-ldap-released diff --git a/deployments/continuous-deployment-config/ocis_ldap/latest.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml similarity index 73% rename from deployments/continuous-deployment-config/ocis_ldap/latest.yml rename to deployments/continuous-deployment-config/ocis_ldap/rolling.yml index a103621bc..4aa1c94f5 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/latest.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-ldap-latest +- name: continuous-deployment-ocis-ldap-rolling server: server_type: cx21 image: ubuntu-22.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-ldap.latest.owncloud.works" + - "*.ocis-ldap.rolling.owncloud.works" vars: ssh_authorized_keys: @@ -33,16 +33,17 @@ INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-ldap.latest.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.latest.owncloud.works + OCIS_DOCKER_IMAGE: owncloud/ocis-rolling + OCIS_DOMAIN: ocis.ocis-ldap.rolling.owncloud.works + LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.rolling.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-ldap.latest.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-ldap.rolling.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-ldap.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-ldap-latest + OCIS_URL: ocis.ocis-ldap.rolling.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-ldap-rolling diff --git a/deployments/continuous-deployment-config/ocis_wopi/released.yml b/deployments/continuous-deployment-config/ocis_wopi/released.yml deleted file mode 100644 index 7eab00c53..000000000 --- a/deployments/continuous-deployment-config/ocis_wopi/released.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- name: continuous-deployment-ocis-wopi-released - server: - server_type: cx21 - image: ubuntu-22.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-wopi.released.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_wopi - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 5.0.3 - OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works - COMPANION_DOMAIN: companion.ocis-wopi.released.owncloud.works - COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud - COMPANION_WEB_CONFIG_FILE_NAME: web-released.yaml - WOPISERVER_DOMAIN: wopiserver.ocis-wopi.released.owncloud.works - COLLABORA_DOMAIN: collabora.ocis-wopi.released.owncloud.works - ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.released.owncloud.works - DEMO_USERS: "true" - 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-wopi.released.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_wopi - OCIS_URL: ocis.ocis-wopi.released.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-wopi-released diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index 922aeefd2..d09343c22 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -48,7 +48,7 @@ services: restart: always ocis: - image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} + image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest} networks: ocis-net: entrypoint: diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index bfc794062..abb51d636 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -47,7 +47,7 @@ services: restart: always ocis: - image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} + image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest} networks: ocis-net: depends_on: diff --git a/deployments/examples/ocis_s3/.env b/deployments/examples/ocis_s3/.env deleted file mode 100644 index 51d5e5972..000000000 --- a/deployments/examples/ocis_s3/.env +++ /dev/null @@ -1,39 +0,0 @@ -# If you're on a internet facing server please comment out following line. -# It skips certificate validation for various parts of oCIS and is needed if you use self signed certificates. -INSECURE=true - -### Traefik settings ### -# Serve Traefik dashboard. Defaults to "false". -TRAEFIK_DASHBOARD= -# Domain of Traefik, where you can find the dashboard. Defaults to "traefik.owncloud.test" -TRAEFIK_DOMAIN= -# Basic authentication for the dashboard. Defaults to user "admin" and password "admin" -TRAEFIK_BASIC_AUTH_USERS= -# Email address for obtaining LetsEncrypt certificates, needs only be changed if this is a public facing server -TRAEFIK_ACME_MAIL= - -### oCIS settings ### -# oCIS version. Defaults to "latest" -OCIS_DOCKER_TAG= -# Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test" -OCIS_DOMAIN= -# oCIS admin user password. Defaults to "admin". -ADMIN_PASSWORD= -# The demo users should not be created on a production instance -# because their passwords are public. Defaults to "false". -DEMO_USERS= - -### MINIO / S3 settings ### -# Domain of MinIO where the Web UI is accessible. Defaults to "minio.owncloud.test". -MINIO_DOMAIN= -# S3 bucket name, where oCIS stores its data in. Defaults to "ocis-bucket". -MINIO_BUCKET= -# S3 bucket access key, which oCIS uses to authenticate. Defaults to "ocis". -MINIO_ACCESS_KEY= -# S3 bucket access key secret, which oCIS uses to authenticate. Defaults to "ocis-secret-key". -MINIO_SECRET_KEY= - -# If you want to use debugging and tracing with this stack, -# you need uncomment following line. Please see documentation at -# https://owncloud.dev/ocis/deployment/monitoring-tracing/ -#COMPOSE_FILE=docker-compose.yml:monitoring_tracing/docker-compose-additions.yml diff --git a/deployments/examples/ocis_s3/README.md b/deployments/examples/ocis_s3/README.md deleted file mode 100644 index 41bdcd8f1..000000000 --- a/deployments/examples/ocis_s3/README.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -document this deployment example in: docs/ocis/deployment/ocis_s3.md ---- - -Please refer to [our documentation](https://owncloud.dev/ocis/deployment/ocis_s3/) -for instructions on how to deploy this scenario. diff --git a/deployments/examples/ocis_s3/docker-compose.yml b/deployments/examples/ocis_s3/docker-compose.yml deleted file mode 100644 index 4bc9ec126..000000000 --- a/deployments/examples/ocis_s3/docker-compose.yml +++ /dev/null @@ -1,132 +0,0 @@ ---- -version: "3.7" - -services: - traefik: - image: traefik:v2.9.1 - networks: - ocis-net: - aliases: - - ${OCIS_DOMAIN:-ocis.owncloud.test} - command: - - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}" - # letsencrypt configuration - - "--certificatesResolvers.http.acme.email=${TRAEFIK_ACME_MAIL:-example@example.org}" - - "--certificatesResolvers.http.acme.storage=/certs/acme.json" - - "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http" - # enable dashboard - - "--api.dashboard=true" - # define entrypoints - - "--entryPoints.http.address=:80" - - "--entryPoints.http.http.redirections.entryPoint.to=https" - - "--entryPoints.http.http.redirections.entryPoint.scheme=https" - - "--entryPoints.https.address=:443" - # docker provider (get configuration from container labels) - - "--providers.docker.endpoint=unix:///var/run/docker.sock" - - "--providers.docker.exposedByDefault=false" - # access log - - "--accessLog=true" - - "--accessLog.format=json" - - "--accessLog.fields.headers.names.X-Request-Id=keep" - ports: - - "80:80" - - "443:443" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "certs:/certs" - labels: - - "traefik.enable=${TRAEFIK_DASHBOARD:-false}" - - "traefik.http.middlewares.traefik-auth.basicauth.users=${TRAEFIK_BASIC_AUTH_USERS:-admin:$$apr1$$4vqie50r$$YQAmQdtmz5n9rEALhxJ4l.}" # defaults to admin:admin - - "traefik.http.routers.traefik.entrypoints=https" - - "traefik.http.routers.traefik.rule=Host(`${TRAEFIK_DOMAIN:-traefik.owncloud.test}`)" - - "traefik.http.routers.traefik.middlewares=traefik-auth" - - "traefik.http.routers.traefik.tls.certresolver=http" - - "traefik.http.routers.traefik.service=api@internal" - logging: - driver: "local" - restart: always - - ocis: - image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} - networks: - ocis-net: - entrypoint: - - /bin/sh - # run ocis init to initialize a configuration file with random secrets - # it will fail on subsequent runs, because the config file already exists - # therefore we ignore the error and then start the ocis server - command: ["-c", "ocis init || true; ocis server"] - environment: - OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} - OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-info} - OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}" - PROXY_TLS: "false" # do not use SSL between Traefik and oCIS - # activate s3ng storage driver - STORAGE_USERS_DRIVER: s3ng - STORAGE_SYSTEM_DRIVER: ocis # keep system data on ocis storage since this are only small files atm - # s3ng specific settings - STORAGE_USERS_S3NG_ENDPOINT: http://minio:9000 - STORAGE_USERS_S3NG_REGION: default - STORAGE_USERS_S3NG_ACCESS_KEY: ${MINIO_ACCESS_KEY:-ocis} - STORAGE_USERS_S3NG_SECRET_KEY: ${MINIO_SECRET_KEY:-ocis-secret-key} - STORAGE_USERS_S3NG_BUCKET: ${MINIO_BUCKET:-ocis-bucket} - # INSECURE: needed if oCIS / Traefik is using self generated certificates - OCIS_INSECURE: "${INSECURE:-false}" - # basic auth (not recommended, but needed for e.g., WebDav clients that do not support OpenID Connect) - PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" - # admin user password - IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # this overrides the admin password from the configuration file - # demo users - IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" - # password policies - OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt" - volumes: - - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt - - ocis-config:/etc/ocis - - ocis-data:/var/lib/ocis - labels: - - "traefik.enable=true" - - "traefik.http.routers.ocis.entrypoints=https" - - "traefik.http.routers.ocis.rule=Host(`${OCIS_DOMAIN:-ocis.owncloud.test}`)" - - "traefik.http.routers.ocis.tls.certresolver=http" - - "traefik.http.routers.ocis.service=ocis" - - "traefik.http.services.ocis.loadbalancer.server.port=9200" - logging: - driver: "local" - restart: always - - minio: - image: minio/minio:latest - networks: - ocis-net: - entrypoint: - - /bin/sh - command: - [ - "-c", - "mkdir -p /data/${MINIO_BUCKET:-ocis-bucket} && minio server --console-address ':9001' /data", - ] - volumes: - - minio-data:/data - environment: - MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY:-ocis} - MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:-ocis-secret-key} - labels: - - "traefik.enable=true" - - "traefik.http.routers.minio.entrypoints=https" - - "traefik.http.routers.minio.rule=Host(`${MINIO_DOMAIN:-minio.owncloud.test}`)" - - "traefik.http.routers.minio.tls.certresolver=http" - - "traefik.http.routers.minio.service=minio" - - "traefik.http.services.minio.loadbalancer.server.port=9001" - logging: - driver: "local" - restart: always - -volumes: - certs: - ocis-config: - ocis-data: - minio-data: - -networks: - ocis-net: diff --git a/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml deleted file mode 100644 index f53140697..000000000 --- a/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -version: "3.7" - -services: - ocis: - environment: - # tracing - OCIS_TRACING_ENABLED: "true" - OCIS_TRACING_TYPE: "jaeger" - OCIS_TRACING_ENDPOINT: jaeger-agent:6831 - # metrics - # if oCIS runs as a single process, all /metrics endpoints - # will expose the same metrics, so it's sufficient to query one endpoint - PROXY_DEBUG_ADDR: 0.0.0.0:9205 - -networks: - ocis-net: - external: true From 58fb913836f28d248b614855a2ac3f59a919bb85 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 15:05:06 +0200 Subject: [PATCH 2/3] chore: use a tag for rolling until next release --- .../ocis_full/onlyoffice-rolling.yml | 2 +- deployments/continuous-deployment-config/ocis_full/rolling.yml | 2 +- .../continuous-deployment-config/ocis_full/s3-rolling.yml | 2 +- .../continuous-deployment-config/ocis_keycloak/rolling.yml | 2 +- deployments/continuous-deployment-config/ocis_ldap/rolling.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index a07d8a87d..24853f871 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest + OCIS_DOCKER_TAG: 6.1.0-alpha.1 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis-onlyoffice.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml index 7433b37d2..a33af3c47 100644 --- a/deployments/continuous-deployment-config/ocis_full/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest + OCIS_DOCKER_TAG: 6.1.0-alpha.1 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml index 9fdf5b7b9..c5bd2cca5 100644 --- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest + OCIS_DOCKER_TAG: 6.1.0-alpha.1 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-s3.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis-s3.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml index 347814c36..f039ab455 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest + OCIS_DOCKER_TAG: 6.1.0-alpha.1 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-keycloak.rolling.owncloud.works KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml index 4aa1c94f5..46a7cdcf1 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest + OCIS_DOCKER_TAG: 6.1.0-alpha.1 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-ldap.rolling.owncloud.works LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.rolling.owncloud.works From 7264fabdf1abcef472c5a1208f3274814d46cde0 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 15:30:50 +0200 Subject: [PATCH 3/3] fix: fix monitoring_tracing config for onlyoffice --- .../ocis_full/onlyoffice-rolling.yml | 2 +- .../monitoring_tracing/monitoring-oo.yml | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index 24853f871..9ad56e587 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -41,7 +41,7 @@ ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.rolling.owncloud.works INBUCKET_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring-oo.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml new file mode 100644 index 000000000..bfd5dc0ad --- /dev/null +++ b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml @@ -0,0 +1,27 @@ +--- +version: "3.7" + +services: + ocis: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + # if oCIS runs as a single process, all /metrics endpoints + # will expose the same metrics, so it's sufficient to query one endpoint + PROXY_DEBUG_ADDR: 0.0.0.0:9205 + + collaboration-oo: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 + +networks: + ocis-net: + external: true