mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-12 23:19:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: change the continous deployments

Browse Source
This commit is contained in:
Michael Barz
2024-06-28 10:34:39 +02:00
parent 3aa127696b
commit 55ee8ca433
6 changed files with 45 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
deployments/continuous-deployment-config/ocis_traefik/latest.yml → deployments/continuous-deployment-config/ocis_full/master.yml
View File

@@ -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

26
deployments/continuous-deployment-config/ocis_traefik/released.yml → deployments/continuous-deployment-config/ocis_full/production.yml
View File

@@ -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

22
deployments/continuous-deployment-config/ocis_traefik/daily.yml → deployments/continuous-deployment-config/ocis_full/rolling.yml
View File

@@ -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

49
deployments/continuous-deployment-config/ocis_s3/latest.yml
View File

@@ -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

3
deployments/examples/ocis_full/.env
View File

@@ -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.

13
deployments/examples/ocis_full/monitoring_tracing/docker-compose-additions.yml → deployments/examples/ocis_full/monitoring_tracing/monitoring.yml
View File

@@ -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: