From 55ee8ca433c62890fc9cdf23be36843f78863aa6 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 10:34:39 +0200 Subject: [PATCH] feat: change the continous deployments --- .../latest.yml => ocis_full/master.yml} | 24 +++++---- .../released.yml => ocis_full/production.yml} | 26 +++++----- .../daily.yml => ocis_full/rolling.yml} | 22 +++++---- .../ocis_s3/latest.yml | 49 ------------------- deployments/examples/ocis_full/.env | 3 +- ...r-compose-additions.yml => monitoring.yml} | 13 +---- 6 files changed, 45 insertions(+), 92 deletions(-) rename deployments/continuous-deployment-config/{ocis_traefik/latest.yml => ocis_full/master.yml} (60%) rename deployments/continuous-deployment-config/{ocis_traefik/released.yml => ocis_full/production.yml} (57%) rename deployments/continuous-deployment-config/{ocis_traefik/daily.yml => ocis_full/rolling.yml} (61%) delete mode 100644 deployments/continuous-deployment-config/ocis_s3/latest.yml rename deployments/examples/ocis_full/monitoring_tracing/{docker-compose-additions.yml => monitoring.yml} (65%) diff --git a/deployments/continuous-deployment-config/ocis_traefik/latest.yml b/deployments/continuous-deployment-config/ocis_full/master.yml similarity index 60% rename from deployments/continuous-deployment-config/ocis_traefik/latest.yml rename to deployments/continuous-deployment-config/ocis_full/master.yml index cbdf59c87b..b818115427 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/latest.yml +++ b/deployments/continuous-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: mbarz@owncloud.com - 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/deployments/continuous-deployment-config/ocis_traefik/released.yml b/deployments/continuous-deployment-config/ocis_full/production.yml similarity index 57% rename from deployments/continuous-deployment-config/ocis_traefik/released.yml rename to deployments/continuous-deployment-config/ocis_full/production.yml index 76767fabbb..05d7e4f0f6 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/released.yml +++ b/deployments/continuous-deployment-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: mbarz@owncloud.com - 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/deployments/continuous-deployment-config/ocis_traefik/daily.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml similarity index 61% rename from deployments/continuous-deployment-config/ocis_traefik/daily.yml rename to deployments/continuous-deployment-config/ocis_full/rolling.yml index 505693fb73..19af01bf24 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/daily.yml +++ b/deployments/continuous-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: mbarz@owncloud.com 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 deleted file mode 100644 index 629ab936cc..0000000000 --- a/deployments/continuous-deployment-config/ocis_s3/latest.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: continuous-deployment-ocis-s3-latest - 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-s3.latest.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_s3 - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-s3.latest.owncloud.works - MINIO_DOMAIN: minio.ocis-s3.latest.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-s3.latest.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-s3.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-s3-latest diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env index e1afb4b193..d5913ca111 100644 --- a/deployments/examples/ocis_full/.env +++ b/deployments/examples/ocis_full/.env @@ -137,9 +137,8 @@ COLLABORA_ADMIN_PASSWORD= ## Debugging - Monitoring ## # Please see documentation at: https://owncloud.dev/ocis/deployment/monitoring-tracing/ -# Only enable if you have Collabora AND OnlyOffice enabled. # The leading colon is required to enable the service. -#MONITORING=:monitoring.yml +#MONITORING=:monitoring_tracing/monitoring.yml ## Uppy Companion Settings ## # The leading colon is required to enable the service. diff --git a/deployments/examples/ocis_full/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml similarity index 65% rename from deployments/examples/ocis_full/monitoring_tracing/docker-compose-additions.yml rename to deployments/examples/ocis_full/monitoring_tracing/monitoring.yml index 4783928716..0ae8c79af8 100644 --- a/deployments/examples/ocis_full/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml @@ -13,23 +13,14 @@ services: # will expose the same metrics, so it's sufficient to query one endpoint PROXY_DEBUG_ADDR: 0.0.0.0:9205 - ocis-appprovider-collabora: + collaboration: environment: # tracing OCIS_TRACING_ENABLED: "true" OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - - ocis-appprovider-onlyoffice: - environment: - # tracing - OCIS_TRACING_ENABLED: "true" - OCIS_TRACING_TYPE: "jaeger" - OCIS_TRACING_ENDPOINT: jaeger-agent:6831 - # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 + COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 networks: ocis-net: