refactor: debrand docker compose deployments -S

opencloud-eu · Jan 15, 2025 · b50a4d9 · b50a4d9
1 parent d07cc2f
commit b50a4d9
Show file tree

Hide file tree

Showing 55 changed files with 332 additions and 332 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -18,5 +18,5 @@ exclude_paths:
   - 'tests/acceptance/TestHelpers/**'
   - 'tests/acceptance/run.sh'
   - 'vendor/**/*'
-  - 'tests/ociswrapper/vendor/**'
+  - 'tests/opencloudwrapper/vendor/**'
 ...
diff --git a/.github/config.yml b/.github/config.yml
@@ -2,7 +2,7 @@
 
 # Comment to be posted to on PRs that don't update documentation
 updateDocsComment: >
-  Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/blob/master/changelog/README.md) item based on your changes.
+  Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/opencloud/blob/master/changelog/README.md) item based on your changes.
 updateDocsWhiteList:
   - Tests-only
   - tests-only

diff --git a/.github/settings.yml b/.github/settings.yml
@@ -2,10 +2,10 @@
 _extends: gh-labels
 
 repository:
-  name: ocis
-  description: ':atom_symbol: ownCloud Infinite Scale Stack'
-  homepage: 'https://doc.owncloud.com/ocis/next/'
-  topics: reva, ocis
+  name: opencloud
+  description: ':atom_symbol: OpenCloud Drive Stack'
+  homepage: 'https://doc.opencloud.eu/opencloud/next/'
+  topics: reva, opencloud
 
   private: false
   has_issues: true
@@ -20,7 +20,7 @@ repository:
   allow_rebase_merge: true
 
 labels:
-  - name: OCIS-Fastlane
+  - name: OpenCloud-Fastlane
     color: "#deadbf"
     description: Planned outside of the sprint
   - name: Storage:EOS
@@ -29,7 +29,7 @@ labels:
     color: "#3F7A62"
   - name: Storage:CephFS
     color: "#3F7A62"
-  - name: Storage:OCIS
+  - name: Storage:opencloud
     color: "#3F7A62"
   - name: Storage:POSIX
     color: "#3F7A62"
@@ -43,7 +43,7 @@ teams:
     permission: push
   - name: cern
     permission: triage
-  - name: ocis-contractors
+  - name: opencloud-contractors
     permission: push
 
 branches:
@@ -65,7 +65,7 @@ branches:
         teams:
           - ci
           - employees
-          - ocis-contractors
+          - opencloud-contractors
   - name: stable-*
     protection:
       required_pull_request_reviews:
@@ -84,7 +84,7 @@ branches:
         teams:
           - ci
           - employees
-          - ocis-contractors
+          - opencloud-contractors
 
 ...
 
diff --git a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis-keycloak.rolling.owncloud.works"
@@ -24,22 +24,22 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
         docker_compose_path: deployments/examples/ocis_keycloak
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: 6.6.1
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_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
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis-keycloak.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_single_container

diff --git a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis-ldap.rolling.owncloud.works"
@@ -24,22 +24,22 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
         docker_compose_path: deployments/examples/ocis_ldap
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: 6.6.1
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_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
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis-ldap.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_single_container

diff --git a/...us-deployment-config/ocis_full/master.yml → ...ployment-config/opencloud_full/master.yml b/...us-deployment-config/ocis_full/master.yml → ...ployment-config/opencloud_full/master.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis.master.owncloud.works"
@@ -24,14 +24,14 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: master
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_DOMAIN: ocis.ocis.master.owncloud.works
           COMPANION_DOMAIN: companion.ocis.master.owncloud.works
           COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
@@ -44,9 +44,9 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis.master.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_full
+          TELEGRAF_SPECIFIC_CONFIG: opencloud_full
           OC_URL: ocis.ocis.master.owncloud.works
           OC_DEPLOYMENT_ID: continuous-deployment-ocis-master
diff --git a/...nt-config/ocis_full/onlyoffice-master.yml → ...nfig/opencloud_full/onlyoffice-master.yml b/...nt-config/ocis_full/onlyoffice-master.yml → ...nfig/opencloud_full/onlyoffice-master.yml
@@ -1,17 +1,17 @@
 ---
-- name: continuous-deployment-ocis-onlyoffice-master
+- name: continuous-deployment-opencloud-onlyoffice-master
   server:
     server_type: cx22
     image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
-      - owncloud-ocis@drone.owncloud.com
+      - drive-opencloud@drone.owncloud.com
     labels:
       owner: ocis-team
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis-onlyoffice.master.owncloud.works"
@@ -24,14 +24,14 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: master
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_DOMAIN: ocis.ocis-onlyoffice.master.owncloud.works
           COMPANION_DOMAIN: companion.ocis-onlyoffice.master.owncloud.works
           COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
@@ -44,7 +44,7 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis-onlyoffice.master.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_onlyoffice

diff --git a/...t-config/ocis_full/onlyoffice-rolling.yml → ...fig/opencloud_full/onlyoffice-rolling.yml b/...t-config/ocis_full/onlyoffice-rolling.yml → ...fig/opencloud_full/onlyoffice-rolling.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis-onlyoffice.rolling.owncloud.works"
@@ -24,14 +24,14 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: 6.6.1
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works
           COMPANION_DOMAIN: companion.ocis-onlyoffice.rolling.owncloud.works
           COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
@@ -44,7 +44,7 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis-onlyoffice.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_onlyoffice

diff --git a/...eployment-config/ocis_full/production.yml → ...ment-config/opencloud_full/production.yml b/...eployment-config/ocis_full/production.yml → ...ment-config/opencloud_full/production.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis.production.owncloud.works"
@@ -24,9 +24,9 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
@@ -43,7 +43,7 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis.production.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_wopi

diff --git a/...s-deployment-config/ocis_full/rolling.yml → ...loyment-config/opencloud_full/rolling.yml b/...s-deployment-config/ocis_full/rolling.yml → ...loyment-config/opencloud_full/rolling.yml
@@ -1,17 +1,17 @@
 ---
-- name: continuous-deployment-ocis-rolling
+- name: continuous-deployment-opencloud-rolling
   server:
     server_type: cx22
     image: ubuntu-24.04
     location: nbg1
     initial_ssh_key_names:
-      - owncloud-ocis@drone.owncloud.com
+      - owncloud-opencloud@drone.owncloud.com
     labels:
       owner: ocis-team
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis.rolling.owncloud.works"
@@ -24,14 +24,14 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: 6.6.1
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_DOMAIN: ocis.ocis.rolling.owncloud.works
           COMPANION_DOMAIN: companion.ocis.rolling.owncloud.works
           COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
@@ -44,9 +44,9 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_full
+          TELEGRAF_SPECIFIC_CONFIG: opencloud_full
           OC_URL: ocis.ocis.rolling.owncloud.works
           OC_DEPLOYMENT_ID: continuous-deployment-ocis-rolling
diff --git a/...eployment-config/ocis_full/s3-rolling.yml → ...ment-config/opencloud_full/s3-rolling.yml b/...eployment-config/ocis_full/s3-rolling.yml → ...ment-config/opencloud_full/s3-rolling.yml
@@ -11,7 +11,7 @@
       for: oCIS-continuous-deployment-examples
     rebuild: $REBUILD
     rebuild_carry_paths:
-      - /var/lib/docker/volumes/ocis_certs
+      - /var/lib/docker/volumes/opencloud_certs
 
   domains:
     - "*.ocis-s3.rolling.owncloud.works"
@@ -24,14 +24,14 @@
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
-        git_url: https://github.com/owncloud/ocis.git
+        git_url: https://github.com/opencloud-eu/opencloud.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_full
+        docker_compose_path: deployments/examples/opencloud_full
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OC_DOCKER_TAG: 6.6.1
-          OC_DOCKER_IMAGE: owncloud/ocis-rolling
+          OC_DOCKER_IMAGE: opencloud-eu/opencloud-rolling
           OC_DOMAIN: ocis.ocis-s3.rolling.owncloud.works
           COMPANION_DOMAIN: companion.ocis-s3.rolling.owncloud.works
           COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
@@ -45,9 +45,9 @@
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
-          NETWORK_NAME: ocis-net
+          NETWORK_NAME: opencloud-net
           TELEMETRY_SERVE_DOMAIN: telemetry.ocis-s3.rolling.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
-          TELEGRAF_SPECIFIC_CONFIG: ocis_full
+          TELEGRAF_SPECIFIC_CONFIG: opencloud_full
           OC_URL: ocis.ocis-s3.rolling.owncloud.works
           OC_DEPLOYMENT_ID: continuous-deployment-ocis-s3-rolling