diff --git a/.drone.star b/.drone.star index f0f0991d8..21d91c151 100644 --- a/.drone.star +++ b/.drone.star @@ -1667,13 +1667,15 @@ def skipIfUnchanged(ctx, type): def example_deploys(ctx): latest_configs = [ - "ocis_ldap/latest.yml", - "ocis_keycloak/latest.yml", - "ocis_traefik/latest.yml", - "ocis_wopi/latest.yml", - "ocis_hello/latest.yml", - "ocis_s3/latest.yml", - "oc10_ocis_parallel/latest.yml", + # TODO: reenable + #"ocis_ldap/latest.yml", + #"ocis_keycloak/latest.yml", + #"ocis_traefik/latest.yml", + #"ocis_wopi/latest.yml", + #"ocis_hello/latest.yml", + #"ocis_s3/latest.yml", + #"oc10_ocis_parallel/latest.yml", + "ocis_individual_services/latest.yml", ] released_configs = [ "ocis_ldap/released.yml", @@ -1746,6 +1748,7 @@ def deploy(ctx, config, rebuild): "trigger": { "ref": [ "refs/heads/master", + "refs/heads/invidivial-services-deployment-example", #TODO: remove "refs/tags/v*", ], }, diff --git a/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml b/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml index 8f78eb264..6d2cbb8a4 100644 --- a/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml +++ b/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml @@ -25,8 +25,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_hello/latest.yml b/deployments/continuous-deployment-config/ocis_hello/latest.yml index 04e58aa14..d4b38625f 100644 --- a/deployments/continuous-deployment-config/ocis_hello/latest.yml +++ b/deployments/continuous-deployment-config/ocis_hello/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_individual_services/latest.yml b/deployments/continuous-deployment-config/ocis_individual_services/latest.yml new file mode 100644 index 000000000..67ebfb680 --- /dev/null +++ b/deployments/continuous-deployment-config/ocis_individual_services/latest.yml @@ -0,0 +1,49 @@ +--- +- name: continuous-deployment-ocis-individual-services-latest + server: + server_type: cx31 + image: ubuntu-20.04 + location: nbg1 + initial_ssh_key_names: + - owncloud-ocis@drone.owncloud.com + labels: + owner: wkloucek + for: oCIS-continuous-deployment-examples + rebuild: $REBUILD + rebuild_carry_paths: + - /var/lib/docker/volumes/ocis_certs + + domains: + - "*.ocis-individual-services.latest.owncloud.works" + + vars: + ssh_authorized_keys: + - https://github.com/butonic.keys + - https://github.com/C0rby.keys + - https://github.com/fschade.keys + - https://github.com/kulmann.keys + - https://github.com/micbar.keys + - https://github.com/pascalwengerter.keys + - https://github.com/wkloucek.keys + docker_compose_projects: + - name: ocis + git_url: https://github.com/owncloud/ocis.git + ref: invidivial-services-deployment-example + docker_compose_path: deployments/examples/ocis_individual_services + env: + INSECURE: "false" + TRAEFIK_ACME_MAIL: wkloucek@owncloud.com + OCIS_DOCKER_TAG: latest + OCIS_SCALE: 6 + OCIS_DOMAIN: ocis.ocis-individual-services.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: support-scaleout-deployment # TODO: master + env: + NETWORK_NAME: ocis-net + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-individual-services.latest.owncloud.works + JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 + TELEGRAF_SPECIFIC_CONFIG: ocis_individual_services + OCIS_URL: ocis.ocis-individual-services.latest.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-individual-services-latest diff --git a/deployments/continuous-deployment-config/ocis_keycloak/latest.yml b/deployments/continuous-deployment-config/ocis_keycloak/latest.yml index afa3503a1..e923589d8 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/latest.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_keycloak/released.yml b/deployments/continuous-deployment-config/ocis_keycloak/released.yml index 173063e60..5c5f38e79 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/released.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/released.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_ldap/latest.yml b/deployments/continuous-deployment-config/ocis_ldap/latest.yml index 26348b942..ecd85c75d 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/latest.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_ldap/released.yml b/deployments/continuous-deployment-config/ocis_ldap/released.yml index c59d000a9..06a6125ec 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/released.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/released.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_s3/latest.yml b/deployments/continuous-deployment-config/ocis_s3/latest.yml index f49ad1a48..76d8fcb7e 100644 --- a/deployments/continuous-deployment-config/ocis_s3/latest.yml +++ b/deployments/continuous-deployment-config/ocis_s3/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_traefik/latest.yml b/deployments/continuous-deployment-config/ocis_traefik/latest.yml index fe5b72938..0f5e22d51 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/latest.yml +++ b/deployments/continuous-deployment-config/ocis_traefik/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_traefik/released.yml b/deployments/continuous-deployment-config/ocis_traefik/released.yml index 999986424..93053a7c5 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/released.yml +++ b/deployments/continuous-deployment-config/ocis_traefik/released.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_wopi/latest.yml b/deployments/continuous-deployment-config/ocis_wopi/latest.yml index 006c1160a..f44c59e70 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/latest.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/latest.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis diff --git a/deployments/continuous-deployment-config/ocis_wopi/released.yml b/deployments/continuous-deployment-config/ocis_wopi/released.yml index 6dd9a23e5..701583d59 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/released.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/released.yml @@ -24,8 +24,6 @@ - https://github.com/kulmann.keys - https://github.com/micbar.keys - https://github.com/pascalwengerter.keys - - https://github.com/paulcod3.keys - - https://github.com/refs.keys - https://github.com/wkloucek.keys docker_compose_projects: - name: ocis