diff --git a/.codacy.yml b/.codacy.yml index 375921f22d..e2e516d872 100644 --- 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 index e6b93d70eb..a656ef2ac6 100644 --- 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 index 99e17563c0..fef46f5dc5 100644 --- 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 index 644e932a5c..6e45052c57 100644 --- 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,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_keycloak env: INSECURE: "false" TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com 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 @@ -39,7 +39,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-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 index 3b6e30b8b1..1167bab1f2 100644 --- 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,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_ldap env: INSECURE: "false" TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com 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 @@ -39,7 +39,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-ldap.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_full/master.yml b/deployments/continuous-deployment-config/opencloud_full/master.yml similarity index 84% rename from deployments/continuous-deployment-config/ocis_full/master.yml rename to deployments/continuous-deployment-config/opencloud_full/master.yml index ec22c3ed7f..7ea6215881 100644 --- a/deployments/continuous-deployment-config/ocis_full/master.yml +++ b/deployments/continuous-deployment-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: julian.koberg@kiteworks.com 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/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml b/deployments/continuous-deployment-config/opencloud_full/onlyoffice-master.yml similarity index 83% rename from deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml rename to deployments/continuous-deployment-config/opencloud_full/onlyoffice-master.yml index 72ed867c95..3a51417bb9 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml +++ b/deployments/continuous-deployment-config/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: julian.koberg@kiteworks.com 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/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/opencloud_full/onlyoffice-rolling.yml similarity index 87% rename from deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml rename to deployments/continuous-deployment-config/opencloud_full/onlyoffice-rolling.yml index 108057ee55..9ee9f62567 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/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: julian.koberg@kiteworks.com 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/deployments/continuous-deployment-config/ocis_full/production.yml b/deployments/continuous-deployment-config/opencloud_full/production.yml similarity index 89% rename from deployments/continuous-deployment-config/ocis_full/production.yml rename to deployments/continuous-deployment-config/opencloud_full/production.yml index 18000a3d7f..abf5daa635 100644 --- a/deployments/continuous-deployment-config/ocis_full/production.yml +++ b/deployments/continuous-deployment-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: julian.koberg@kiteworks.com @@ -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/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/opencloud_full/rolling.yml similarity index 80% rename from deployments/continuous-deployment-config/ocis_full/rolling.yml rename to deployments/continuous-deployment-config/opencloud_full/rolling.yml index fa22515c5f..f2c63f5254 100644 --- a/deployments/continuous-deployment-config/ocis_full/rolling.yml +++ b/deployments/continuous-deployment-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: julian.koberg@kiteworks.com 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/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml b/deployments/continuous-deployment-config/opencloud_full/s3-rolling.yml similarity index 85% rename from deployments/continuous-deployment-config/ocis_full/s3-rolling.yml rename to deployments/continuous-deployment-config/opencloud_full/s3-rolling.yml index 05ea103235..d967c1e760 100644 --- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml +++ b/deployments/continuous-deployment-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: julian.koberg@kiteworks.com 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 diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index f0a09c2a2e..a837f360ac 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -5,7 +5,7 @@ services: traefik: image: traefik:v2.9.1 networks: - ocis-net: + opencloud-net: aliases: - ${CLOUD_DOMAIN:-cloud.owncloud.test} - ${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} @@ -47,27 +47,27 @@ services: driver: "local" restart: always - ocis-init-volumes: + opencloud-init-volumes: image: busybox entrypoint: - /bin/sh # prepare the oCIS config volume for oCIS - command: ["-c", "chown -R 33:33 /etc/ocis /var/lib/ocis"] + command: ["-c", "chown -R 33:33 /etc/opencloud /var/lib/opencloud"] volumes: - - ocis-config:/etc/ocis - - ocis-data:/var/lib/ocis + - opencloud-config:/etc/opencloud + - opencloud-data:/var/lib/opencloud - ocis: - image: owncloud/ocis:${OC_DOCKER_TAG:-latest} + opencloud: + image: opencloud-eu/opencloud:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: user: "33:33" # equals the user "www-data" for oC10 entrypoint: - /bin/sh - # run ocis init to initialize a configuration file with random secrets + # run opencloud 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"] + # therefore we ignore the error and then start the opencloud server + command: ["-c", "opencloud init || true; opencloud server"] #entrypoint: # - /bin/sh # - /entrypoint-override.sh @@ -75,7 +75,7 @@ services: # Keycloak IDP specific configuration OC_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud} PROXY_OIDC_REWRITE_WELLKNOWN: "true" - WEB_OIDC_CLIENT_ID: ocis-web + WEB_OIDC_CLIENT_ID: opencloud-web WEB_OIDC_SCOPE: openid profile email owncloud # external ldap is supposed to be read-only GRAPH_IDENTITY_BACKEND: ldap @@ -86,7 +86,7 @@ services: OC_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com" OC_LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin} # LDAP user settings - PROXY_USER_OIDC_CLAIM: ocis.user.uuid # claim was added in Keycloak + PROXY_USER_OIDC_CLAIM: opencloud.user.uuid # claim was added in Keycloak PROXY_USER_CS3_CLAIM: userid # equals LDAP_USER_SCHEMA_ID OC_LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com" OC_LDAP_GROUP_SCHEMA_ID: "ownclouduuid" @@ -127,10 +127,10 @@ services: # password policies OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt" volumes: - - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt - - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - - ocis-config:/etc/ocis - - ocis-data:/var/lib/ocis + - ./config/ocis/banned-password-list.txt:/etc/opencloud/banned-password-list.txt + - ./config/ocis/proxy.yaml:/etc/opencloud/proxy.yaml + - opencloud-config:/etc/opencloud + - opencloud-data:/var/lib/opencloud # shared volume with oC10 - oc10-data:/mnt/data labels: @@ -147,7 +147,7 @@ services: oc10: image: owncloud/server:${OC10_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: environment: # make ownCloud Web the default frontend OWNCLOUD_DEFAULT_APP: ${OWNCLOUD_DEFAULT_APP:-files} # can be switched to "web" @@ -209,7 +209,7 @@ services: # Keycloak WildFly distribution, Quarkus is not ready yet for automatic setup https://github.com/keycloak/keycloak/issues/10216 image: quay.io/keycloak/keycloak:legacy networks: - ocis-net: + opencloud-net: entrypoint: ["/bin/sh", "/opt/jboss/tools/docker-entrypoint-override.sh"] volumes: - ./config/keycloak/docker-entrypoint-override.sh:/opt/jboss/tools/docker-entrypoint-override.sh @@ -242,7 +242,7 @@ services: openldap: image: osixia/openldap:latest networks: - ocis-net: + opencloud-net: command: --copy-service --loglevel debug environment: LDAP_TLS_VERIFY_CLIENT: never @@ -260,7 +260,7 @@ services: ldap-manager: image: osixia/phpldapadmin:0.9.0 networks: - ocis-net: + opencloud-net: environment: PHPLDAPADMIN_LDAP_HOSTS: openldap PHPLDAPADMIN_HTTPS: "false" @@ -278,7 +278,7 @@ services: keycloak-db: image: postgres:alpine networks: - ocis-net: + opencloud-net: volumes: - keycloak-postgres-data:/var/lib/postgresql/data environment: @@ -292,7 +292,7 @@ services: oc10-db: image: mariadb:10.6 networks: - ocis-net: + opencloud-net: environment: - MYSQL_ROOT_PASSWORD=owncloud - MYSQL_USER=owncloud @@ -317,7 +317,7 @@ services: redis: networks: - ocis-net: + opencloud-net: image: redis:6 command: ["--databases", "1"] healthcheck: @@ -333,8 +333,8 @@ services: volumes: certs: - ocis-config: - ocis-data: + opencloud-config: + opencloud-data: keycloak-postgres-data: oc10-mysql-data: oc10-redis-data: @@ -342,4 +342,4 @@ volumes: oc10-tmp: networks: - ocis-net: + opencloud-net: diff --git a/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml index d3b9965d8f..889b9a9301 100644 --- a/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml @@ -2,7 +2,7 @@ version: "3.7" services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -14,5 +14,5 @@ services: PROXY_DEBUG_ADDR: 0.0.0.0:9205 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/oc10_ocis_parallel/testing/docker-compose-additions.yml b/deployments/examples/oc10_ocis_parallel/testing/docker-compose-additions.yml index cee38e329d..0132c853ff 100644 --- a/deployments/examples/oc10_ocis_parallel/testing/docker-compose-additions.yml +++ b/deployments/examples/oc10_ocis_parallel/testing/docker-compose-additions.yml @@ -2,7 +2,7 @@ version: "3.7" services: - ocis: + opencloud: environment: LDAP_GROUP_BASE_DN: "ou=TestGroups,dc=owncloud,dc=com" LDAP_USER_BASE_DN: "ou=TestUsers,dc=owncloud,dc=com" diff --git a/deployments/examples/ocis_full/.env b/deployments/examples/ocis_full/.env deleted file mode 100644 index 8beabe8e5d..0000000000 --- a/deployments/examples/ocis_full/.env +++ /dev/null @@ -1,240 +0,0 @@ -## Basic Settings ## -# Define the docker compose log driver used. -# Defaults to local -LOG_DRIVER= -# If you're on an internet facing server, comment out following line. -# It skips certificate validation for various parts of Infinite Scale and is -# needed when self signed certificates are used. -INSECURE=true - - -## Traefik Settings ## -# Note: Traefik is always enabled and can't be disabled. -# 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 traefik dashboard. -# Defaults to user "admin" and password "admin" (written as: "admin: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= -# Set to the following for testing to check the certificate process: -# "https://acme-staging-v02.api.letsencrypt.org/directory" -# With staging configured, there will be an SSL error in the browser. -# When certificates are displayed and are emitted by # "Fake LE Intermediate X1", -# the process went well and the envvar can be reset to empty to get valid certificates. -TRAEFIK_ACME_CASERVER= - - -## Infinite Scale Settings ## -# Beside Traefik, this service must stay enabled. -# Disable only for testing purposes. -# Note: the leading colon is required to enable the service. -OCIS=:ocis.yml -# The oCIS container image. -# For production releases: "owncloud/ocis" -# For rolling releases: "owncloud/ocis-rolling" -# Defaults to production if not set otherwise -OC_DOCKER_IMAGE=owncloud/ocis-rolling -# The oCIS container version. -# Defaults to "latest" and points to the latest stable tag. -OC_DOCKER_TAG= -# Domain of oCIS, where you can find the frontend. -# Defaults to "ocis.owncloud.test" -OC_DOMAIN= -# oCIS admin user password. Defaults to "admin". -ADMIN_PASSWORD= -# Demo users should not be created on a production instance, -# because their passwords are public. Defaults to "false". -# Also see: https://doc.owncloud.com/ocis/latest/deployment/general/general-info.html#demo-users-and-groups -DEMO_USERS= -# Define the oCIS loglevel used. -# For more details see: -# https://doc.owncloud.com/ocis/latest/deployment/services/env-vars-special-scope.html -LOG_LEVEL= -# Define the kind of logging. -# The default log can be read by machines. -# Set this to true to make the log human readable. -# LOG_PRETTY=true -# -# Define the oCIS storage location. Set the paths for config and data to a local path. -# Note that especially the data directory can grow big. -# Leaving it default stores data in docker internal volumes. -# For more details see: -# https://doc.owncloud.com/ocis/next/deployment/general/general-info.html#default-paths -# OC_CONFIG_DIR=/your/local/ocis/config -# OC_DATA_DIR=/your/local/ocis/data - -# S3 Storage configuration - optional -# Infinite Scale supports S3 storage as primary storage. -# Per default, S3 storage is disabled and the local filesystem is used. -# To enable S3 storage, uncomment the following line and configure the S3 storage. -# For more details see: -# https://doc.owncloud.com/ocis/next/deployment/storage/s3.html -# Note: the leading colon is required to enable the service. -#S3NG=:s3ng.yml -# Configure the S3 storage endpoint. Defaults to "http://minio:9000" for testing purposes. -S3NG_ENDPOINT= -# S3 region. Defaults to "default". -S3NG_REGION= -# S3 access key. Defaults to "ocis" -S3NG_ACCESS_KEY= -# S3 secret. Defaults to "ocis-secret-key" -S3NG_SECRET_KEY= -# S3 bucket. Defaults to "ocis" -S3NG_BUCKET= -# -# For testing purposes, add local minio S3 storage to the docker-compose file. -# The leading colon is required to enable the service. -#S3NG_MINIO=:minio.yml -# Minio domain. Defaults to "minio.owncloud.test". -MINIO_DOMAIN= - -# Define SMPT settings if you would like to send Infinite Scale email notifications. -# For more details see: -# https://doc.owncloud.com/ocis/latest/deployment/services/s-list/notifications.html -# NOTE: when configuring Inbucket, these settings have no effect, see inbucket.yml for details. -# SMTP host to connect to. -SMTP_HOST= -# Port of the SMTP host to connect to. -SMTP_PORT= -# An eMail address that is used for sending Infinite Scale notification eMails -# like "ocis notifications ". -SMTP_SENDER= -# Username for the SMTP host to connect to. -SMTP_USERNAME= -# Password for the SMTP host to connect to. -SMTP_PASSWORD= -# Authentication method for the SMTP communication. -SMTP_AUTHENTICATION= -# Allow insecure connections to the SMTP server. Defaults to false. -SMTP_INSECURE= - -# Addititional services to be started on ocis startup -# The following list of services is not startet automatically and must be -# manually defined for startup: -# IMPORTANT: The notification service is MANDATORY, do not delete! -# IMPORTANT: Add any services to the startup list comma separated like "notifications,antivirus" etc. -START_ADDITIONAL_SERVICES="notifications" - - -## oCIS Web Extensions ## -# It is possible to use the oCIS Web Extensions to add custom functionality to the oCIS frontend. -# For more details see https://github.com/owncloud/web-extensions/blob/main/README.md -# Note: the leading colon is required to enable the service. -# Enable this to create a new named volume -#EXTENSIONS=:web_extensions/extensions.yml -# Enable the desired extensions by uncommenting the following lines. -# Note: the leading colon is required to enable the service. -# Note: if you want to remove a web extension, you must delete the ocis-apps volume. It will be properly recreated on docker compose startup. -#UNZIP=:web_extensions/unzip.yml -#DRAWIO=:web_extensions/drawio.yml -#JSONVIEWER=:web_extensions/jsonviewer.yml -#PROGRESSBARS=:web_extensions/progressbars.yml -#EXTERNALSITES=:web_extensions/externalsites.yml -# External Sites needs additional config, see the following files for more details. -# - config/ocis/apps.yaml -# - config/ocis/csp.yaml -#IMPORTER=:web_extensions/importer.yml -# The importer needs additional config, see the following lines for more details. -## The docker image to be used for uppy companion. -# owncloud has built a container with public link import support. -COMPANION_IMAGE= -# Domain of Uppy Companion. Defaults to "companion.owncloud.test". -COMPANION_DOMAIN= -# Provider settings, see https://uppy.io/docs/companion/#provideroptions for reference. -# Empty by default, which disables providers. -COMPANION_ONEDRIVE_KEY= -COMPANION_ONEDRIVE_SECRET= - - -## Default Enabled Services ## - -### Apache Tika Content Analysis Toolkit ### -# Tika (search) is enabled by default, comment if not required. -# Note: the leading colon is required to enable the service. -TIKA=:tika.yml -# Set the desired docker image tag or digest. -# Defaults to "latest" -TIKA_IMAGE= - -### IMPORTANT Note for Online Office Apps ### -# To avoid app interlocking issues, you should select only one app to be active/configured. -# This is due the fact that there is currently no app interlocking for the same file and one -# has to wait for a lock release to open the file with another app. - -### Collabora Settings ### -# Collabora web office is default enabled, comment if not required. -# Note: the leading colon is required to enable the service. -COLLABORA=:collabora.yml -# Domain of Collabora, where you can find the frontend. -# Defaults to "collabora.owncloud.test" -COLLABORA_DOMAIN= -# Domain of the wopiserver which handles OnlyOffice. -# Defaults to "wopiserver.owncloud.test" -WOPISERVER_DOMAIN= -# Admin user for Collabora. -# Defaults to "admin". -# Collabora Admin Panel URL: -# https://{COLLABORA_DOMAIN}/browser/dist/admin/admin.html -COLLABORA_ADMIN_USER= -# Admin password for Collabora. -# Defaults to "admin". -COLLABORA_ADMIN_PASSWORD= -# Set to true to enable SSL for Collabora Online. Default is true if not specified. -COLLABORA_SSL_ENABLE=false -# If you're on an internet-facing server, enable SSL verification for Collabora Online. -# Please comment out the following line: -COLLABORA_SSL_VERIFICATION=false - - -## Supplemental Configurations ## -# If you want to use supplemental configurations, -# you need to uncomment lines containing :path/file.yml -# and configure the service as required. - - -### Debugging - Monitoring ### -# Please see documentation at: https://owncloud.dev/ocis/deployment/monitoring-tracing/ -# Note: the leading colon is required to enable the service. -#MONITORING=:monitoring_tracing/monitoring.yml - - -### Virusscanner Settings ### -# IMPORTANT: If you enable antivirus, you also MUST configure the START_ADDITIONAL_SERVICES -# envvar in the Infinite Scale Settings above by adding 'antivirus' to the list. -# Note: the leading colon is required to enable the service. -#CLAMAV=:clamav.yml -# Image version of the ClamAV container. -# Defaults to "latest" -CLAMAV_DOCKER_TAG= - - -### OnlyOffice Settings ### -# Note: the leading colon is required to enable the service. -#ONLYOFFICE=:onlyoffice.yml -# Domain for OnlyOffice. Defaults to "onlyoffice.owncloud.test". -ONLYOFFICE_DOMAIN= -# Domain for the wopiserver which handles OnlyOffice. -WOPISERVER_ONLYOFFICE_DOMAIN= - - -### Inbucket Settings ### -# Inbucket is a mail catcher tool for testing purposes. -# DO NOT use in Production. -# Note: the leading colon is required to enable the service. -#INBUCKET=:inbucket.yml -# email server (in this case inbucket acts as mail catcher). -# Domain for Inbucket. Defaults to "mail.owncloud.test". -INBUCKET_DOMAIN= - - -## IMPORTANT ## -# This MUST be the last line as it assembles the supplemental compose files to be used. -# ALL supplemental configs must be added here, whether commented or not. -# Each var must either be empty or contain :path/file.yml -COMPOSE_FILE=docker-compose.yml${OCIS:-}${TIKA:-}${S3NG:-}${S3NG_MINIO:-}${COLLABORA:-}${MONITORING:-}${IMPORTER:-}${CLAMAV:-}${ONLYOFFICE:-}${INBUCKET:-}${EXTENSIONS:-}${UNZIP:-}${DRAWIO:-}${JSONVIEWER:-}${PROGRESSBARS:-}${EXTERNALSITES:-} diff --git a/deployments/examples/ocis_full/debug-ocis.yml b/deployments/examples/ocis_full/debug-ocis.yml deleted file mode 100644 index 64a5c86a69..0000000000 --- a/deployments/examples/ocis_full/debug-ocis.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -services: - - ocis: - command: [ "-c", "ocis init || true; dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis server" ] - ports: - - 40000:40000 diff --git a/deployments/examples/ocis_full/s3ng.yml b/deployments/examples/ocis_full/s3ng.yml deleted file mode 100644 index cde233e339..0000000000 --- a/deployments/examples/ocis_full/s3ng.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -services: - ocis: - environment: - # activate s3ng storage driver - STORAGE_USERS_DRIVER: s3ng - # keep system data on ocis storage since this are only small files atm - STORAGE_SYSTEM_DRIVER: ocis - # s3ng specific settings - STORAGE_USERS_S3NG_ENDPOINT: ${S3NG_ENDPOINT:-http://minio:9000} - STORAGE_USERS_S3NG_REGION: ${S3NG_REGION:-default} - STORAGE_USERS_S3NG_ACCESS_KEY: ${S3NG_ACCESS_KEY:-ocis} - STORAGE_USERS_S3NG_SECRET_KEY: ${S3NG_SECRET_KEY:-ocis-secret-key} - STORAGE_USERS_S3NG_BUCKET: ${S3NG_BUCKET:-ocis-bucket} diff --git a/deployments/examples/ocis_full/web_extensions/extensions.yml b/deployments/examples/ocis_full/web_extensions/extensions.yml deleted file mode 100644 index d2a60a039b..0000000000 --- a/deployments/examples/ocis_full/web_extensions/extensions.yml +++ /dev/null @@ -1,7 +0,0 @@ -services: - ocis: - volumes: - - ocis-apps:/var/lib/ocis/web/assets/apps - -volumes: - ocis-apps: diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index 2d0c1819ef..20e8bfe2b6 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -5,9 +5,9 @@ services: traefik: image: traefik:v2.9.1 networks: - ocis-net: + opencloud-net: aliases: - - ${OC_DOMAIN:-ocis.owncloud.test} + - ${OC_DOMAIN:-drive.opencloud.test} command: - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}" # letsencrypt configuration @@ -46,18 +46,18 @@ services: driver: "local" restart: always - ocis: - image: owncloud/ocis:${OC_DOCKER_TAG:-latest} + opencloud: + image: opencloud-eu/opencloud:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: entrypoint: - /bin/sh - # run ocis init to initialize a configuration file with random secrets + # run opencloud 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"] + # therefore we ignore the error and then start the opencloud server + command: ["-c", "opencloud init || true; opencloud server"] environment: - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} OC_LOG_LEVEL: ${OC_LOG_LEVEL:-info} OC_LOG_COLOR: "${OC_LOG_COLOR:-false}" PROXY_TLS: "false" # do not use SSL between Traefik and oCIS @@ -74,26 +74,26 @@ services: # password policies OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt" volumes: - - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt - - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - - ./config/ocis/web.yaml:/etc/ocis/web.yaml - - ocis-config:/etc/ocis - - ocis-data:/var/lib/ocis + - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt + - ./config/opencloud/proxy.yaml:/etc/opencloud/proxy.yaml + - ./config/opencloud/web.yaml:/etc/opencloud/web.yaml + - opencloud-config:/etc/opencloud + - opencloud-data:/var/lib/opencloud labels: - "traefik.enable=true" - - "traefik.http.routers.ocis.entrypoints=https" - - "traefik.http.routers.ocis.rule=Host(`${OC_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" + - "traefik.http.routers.opencloud.entrypoints=https" + - "traefik.http.routers.opencloud.rule=Host(`${OC_DOMAIN:-drive.opencloud.test}`)" + - "traefik.http.routers.opencloud.tls.certresolver=http" + - "traefik.http.routers.opencloud.service=opencloud" + - "traefik.http.services.opencloud.loadbalancer.server.port=9200" logging: driver: "local" restart: always - ocis-hello: - image: owncloud/ocis-hello:${OC_HELLO_DOCKER_TAG:-latest} + opencloud-hello: + image: opencloud-eu/opencloud-hello:${OC_HELLO_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: environment: OC_LOG_LEVEL: ${OC_LOG_LEVEL:-info} logging: @@ -102,8 +102,8 @@ services: volumes: certs: - ocis-config: - ocis-data: + opencloud-config: + opencloud-data: networks: - ocis-net: + opencloud-net: diff --git a/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml index d3b9965d8f..889b9a9301 100644 --- a/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml @@ -2,7 +2,7 @@ version: "3.7" services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -14,5 +14,5 @@ services: PROXY_DEBUG_ADDR: 0.0.0.0:9205 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml index 302cf386aa..88cb4da016 100644 --- a/deployments/examples/ocis_keycloak/docker-compose.yml +++ b/deployments/examples/ocis_keycloak/docker-compose.yml @@ -5,9 +5,9 @@ services: traefik: image: traefik:v2.9.1 networks: - ocis-net: + opencloud-net: aliases: - - ${OC_DOMAIN:-ocis.owncloud.test} + - ${OC_DOMAIN:-drive.opencloud.test} - ${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} command: - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}" @@ -47,16 +47,16 @@ services: driver: ${LOG_DRIVER:-local} restart: always - ocis: - image: ${OC_DOCKER_IMAGE:-owncloud/ocis}:${OC_DOCKER_TAG:-latest} + opencloud: + image: ${OC_DOCKER_IMAGE:-opencloud-eu/opencloud}:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: entrypoint: - /bin/sh - # run ocis init to initialize a configuration file with random secrets + # run opencloud 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"] + # therefore we ignore the error and then start the opencloud server + command: ["-c", "opencloud init || true; opencloud server"] environment: # Keycloak IDP specific configuration PROXY_AUTOPROVISION_ACCOUNTS: "true" @@ -65,7 +65,7 @@ services: PROXY_OIDC_REWRITE_WELLKNOWN: "true" WEB_OIDC_CLIENT_ID: ${OC_OIDC_CLIENT_ID:-web} # general config - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} OC_LOG_LEVEL: ${OC_LOG_LEVEL:-info} OC_LOG_COLOR: "${OC_LOG_COLOR:-false}" PROXY_TLS: "false" # do not use SSL between Traefik and oCIS @@ -79,20 +79,20 @@ services: GRAPH_USERNAME_MATCH: "none" # password policies OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: "banned-password-list.txt" - PROXY_CSP_CONFIG_FILE_LOCATION: /etc/ocis/csp.yaml + PROXY_CSP_CONFIG_FILE_LOCATION: /etc/opencloud/csp.yaml KEYCLOAK_DOMAIN: ${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} volumes: - - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt - - ./config/ocis/csp.yaml:/etc/ocis/csp.yaml - - ocis-config:/etc/ocis - - ocis-data:/var/lib/ocis + - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt + - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml + - opencloud-config:/etc/opencloud + - opencloud-data:/var/lib/opencloud labels: - "traefik.enable=true" - - "traefik.http.routers.ocis.entrypoints=https" - - "traefik.http.routers.ocis.rule=Host(`${OC_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" + - "traefik.http.routers.opencloud.entrypoints=https" + - "traefik.http.routers.opencloud.rule=Host(`${OC_DOMAIN:-drive.opencloud.test}`)" + - "traefik.http.routers.opencloud.tls.certresolver=http" + - "traefik.http.routers.opencloud.service=opencloud" + - "traefik.http.services.opencloud.loadbalancer.server.port=9200" logging: driver: ${LOG_DRIVER:-local} restart: always @@ -100,7 +100,7 @@ services: postgres: image: postgres:alpine networks: - ocis-net: + opencloud-net: volumes: - keycloak_postgres_data:/var/lib/postgresql/data environment: @@ -114,14 +114,14 @@ services: keycloak: image: quay.io/keycloak/keycloak:25.0.0 networks: - ocis-net: + opencloud-net: command: ["start", "--proxy=edge", "--spi-connections-http-client-default-disable-trust-manager=${INSECURE:-false}", "--import-realm"] entrypoint: ["/bin/sh", "/opt/keycloak/bin/docker-entrypoint-override.sh"] volumes: - "./config/keycloak/docker-entrypoint-override.sh:/opt/keycloak/bin/docker-entrypoint-override.sh" - - "./config/keycloak/ocis-realm.dist.json:/opt/keycloak/data/import-dist/ocis-realm.json" + - "./config/keycloak/opencloud-realm.dist.json:/opt/keycloak/data/import-dist/opencloud-realm.json" environment: - OC_DOMAIN: ${OC_DOMAIN:-ocis.owncloud.test} + OC_DOMAIN: ${OC_DOMAIN:-drive.opencloud.test} KC_HOSTNAME: ${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} KC_DB: postgres KC_DB_URL: "jdbc:postgresql://postgres:5432/keycloak" @@ -145,9 +145,9 @@ services: volumes: certs: - ocis-config: - ocis-data: + opencloud-config: + opencloud-data: keycloak_postgres_data: networks: - ocis-net: + opencloud-net: diff --git a/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml index d3b9965d8f..889b9a9301 100644 --- a/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml @@ -2,7 +2,7 @@ version: "3.7" services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -14,5 +14,5 @@ services: PROXY_DEBUG_ADDR: 0.0.0.0:9205 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index be3767c3fb..52064f5226 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -5,9 +5,9 @@ services: traefik: image: traefik:v2.9.1 networks: - ocis-net: + opencloud-net: aliases: - - ${OC_DOMAIN:-ocis.owncloud.test} + - ${OC_DOMAIN:-drive.opencloud.test} command: - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}" # letsencrypt configuration @@ -46,18 +46,18 @@ services: driver: ${LOG_DRIVER:-local} restart: always - ocis: - image: ${OC_DOCKER_IMAGE:-owncloud/ocis}:${OC_DOCKER_TAG:-latest} + opencloud: + image: ${OC_DOCKER_IMAGE:-opencloud-eu/opencloud}:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: depends_on: - ldap-server entrypoint: - /bin/sh - # run ocis init to initialize a configuration file with random secrets + # run opencloud 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" ] + # therefore we ignore the error and then start the opencloud server + command: [ "-c", "opencloud init || true; opencloud server" ] environment: # users/groups from ldap OC_LDAP_URI: ldaps://ldap-server:1636 @@ -80,7 +80,7 @@ services: # OC_RUN_SERVICES specifies to start all services except glauth, idm and accounts. These are replaced by external services OC_EXCLUDE_RUN_SERVICES: idm # General oCIS config - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} OC_LOG_LEVEL: ${OC_LOG_LEVEL:-info} OC_LOG_COLOR: "${OC_LOG_COLOR:-false}" PROXY_TLS: "false" # do not use SSL between Traefik and oCIS @@ -91,16 +91,16 @@ services: # password policies OC_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 + - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt + - opencloud-config:/etc/opencloud + - opencloud-data:/var/lib/opencloud labels: - "traefik.enable=true" - - "traefik.http.routers.ocis.entrypoints=https" - - "traefik.http.routers.ocis.rule=Host(`${OC_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" + - "traefik.http.routers.opencloud.entrypoints=https" + - "traefik.http.routers.opencloud.rule=Host(`${OC_DOMAIN:-drive.opencloud.test}`)" + - "traefik.http.routers.opencloud.tls.certresolver=http" + - "traefik.http.routers.opencloud.service=opencloud" + - "traefik.http.services.opencloud.loadbalancer.server.port=9200" logging: driver: ${LOG_DRIVER:-local} restart: always @@ -108,7 +108,7 @@ services: ldap-server: image: bitnami/openldap:2.6 networks: - ocis-net: + opencloud-net: entrypoint: ["/bin/sh", "/opt/bitnami/scripts/openldap/docker-entrypoint-override.sh", "/opt/bitnami/scripts/openldap/run.sh" ] environment: BITNAMI_DEBUG: true @@ -135,7 +135,7 @@ services: ldap-manager: image: osixia/phpldapadmin:latest networks: - ocis-net: + opencloud-net: environment: PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'ldap-server': [{'server': [{'port': 1389}]}]}]" PHPLDAPADMIN_HTTPS: "false" @@ -153,10 +153,10 @@ services: volumes: certs: ldap-certs: - ocis-config: - ocis-data: + opencloud-config: + opencloud-data: ldap-data: networks: - ocis-net: + opencloud-net: diff --git a/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml index d3b9965d8f..889b9a9301 100644 --- a/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml @@ -2,7 +2,7 @@ version: "3.7" services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -14,5 +14,5 @@ services: PROXY_DEBUG_ADDR: 0.0.0.0:9205 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/ocis_full/README.md b/deployments/examples/opencloud_full/README.md similarity index 92% rename from deployments/examples/ocis_full/README.md rename to deployments/examples/opencloud_full/README.md index a9a42ed672..5cc02e48f2 100644 --- a/deployments/examples/ocis_full/README.md +++ b/deployments/examples/opencloud_full/README.md @@ -1,5 +1,5 @@ --- -document this deployment example in: docs/ocis/deployment/ocis_full.md +document this deployment example in: docs/ocis/deployment/opencloud_full.md --- # Infinite Scale WOPI Deployment Example diff --git a/deployments/examples/ocis_full/clamav.yml b/deployments/examples/opencloud_full/clamav.yml similarity index 82% rename from deployments/examples/ocis_full/clamav.yml rename to deployments/examples/opencloud_full/clamav.yml index ff577fa1b5..4af6d68dce 100644 --- a/deployments/examples/ocis_full/clamav.yml +++ b/deployments/examples/opencloud_full/clamav.yml @@ -1,14 +1,14 @@ --- services: - ocis: + opencloud: environment: ANTIVIRUS_SCANNER_TYPE: "clamav" ANTIVIRUS_CLAMAV_SOCKET: "/var/run/clamav/clamd.sock" - # the antivirus service needs manual startup, see .env and ocis.yaml for START_ADDITIONAL_SERVICES + # the antivirus service needs manual startup, see .env and opencloud.yaml for START_ADDITIONAL_SERVICES # configure the antivirus service POSTPROCESSING_STEPS: "virusscan" # PROXY_TLS is set to "false", the download url has no https - STORAGE_USERS_DATA_GATEWAY_URL: http://ocis:9200/data + STORAGE_USERS_DATA_GATEWAY_URL: http://opencloud:9200/data volumes: - "clamav-socket:/var/run/clamav" @@ -16,7 +16,7 @@ services: image: clamav/clamav:${CLAMAV_DOCKER_TAG:-latest} # release notes: https://blog.clamav.net networks: - ocis-net: + opencloud-net: volumes: - "clamav-socket:/tmp" - "clamav-db:/var/lib/clamav" diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/opencloud_full/collabora.yml similarity index 87% rename from deployments/examples/ocis_full/collabora.yml rename to deployments/examples/opencloud_full/collabora.yml index 642b8638e1..4bc2d59afa 100644 --- a/deployments/examples/ocis_full/collabora.yml +++ b/deployments/examples/opencloud_full/collabora.yml @@ -2,33 +2,33 @@ services: traefik: networks: - ocis-net: + opencloud-net: aliases: - ${COLLABORA_DOMAIN:-collabora.owncloud.test} - ${WOPISERVER_DOMAIN:-wopiserver.owncloud.test} - ocis: + opencloud: environment: # make collabora the secure view app FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.CollaboraOnline GRAPH_AVAILABLE_ROLES: "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6" collaboration: - image: ${OC_DOCKER_IMAGE:-owncloud/ocis}:${OC_DOCKER_TAG:-latest} + image: ${OC_DOCKER_IMAGE:-opencloud-eu/opencloud}:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: depends_on: - ocis: + opencloud: condition: service_started collabora: condition: service_healthy entrypoint: - /bin/sh - command: [ "-c", "ocis collaboration server" ] + command: [ "-c", "opencloud collaboration server" ] environment: COLLABORATION_GRPC_ADDR: 0.0.0.0:9301 COLLABORATION_HTTP_ADDR: 0.0.0.0:9300 MICRO_REGISTRY: "nats-js-kv" - MICRO_REGISTRY_ADDRESS: "ocis:9233" + MICRO_REGISTRY_ADDRESS: "opencloud:9233" COLLABORATION_WOPI_SRC: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test} COLLABORATION_APP_NAME: "CollaboraOnline" COLLABORATION_APP_PRODUCT: "Collabora" @@ -37,10 +37,10 @@ services: COLLABORATION_APP_INSECURE: "${INSECURE:-true}" COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}" COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} volumes: # configure the .env file to use own paths instead of docker internal volumes - - ${OC_CONFIG_DIR:-ocis-config}:/etc/ocis + - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud labels: - "traefik.enable=true" - "traefik.http.routers.collaboration.entrypoints=https" @@ -56,7 +56,7 @@ services: image: collabora/code:24.04.11.1.1 # release notes: https://www.collaboraonline.com/release-notes/ networks: - ocis-net: + opencloud-net: environment: aliasgroup1: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}:443 DONT_GEN_SSL_CERT: "YES" @@ -65,7 +65,7 @@ services: --o:ssl.ssl_verification=${COLLABORA_SSL_VERIFICATION:-true} \ --o:ssl.termination=true \ --o:welcome.enable=false \ - --o:net.frame_ancestors=${OC_DOMAIN:-ocis.owncloud.test} + --o:net.frame_ancestors=${OC_DOMAIN:-drive.opencloud.test} username: ${COLLABORA_ADMIN_USER:-admin} password: ${COLLABORA_ADMIN_PASSWORD:-admin} cap_add: diff --git a/deployments/examples/ocis_full/config/onlyoffice/entrypoint-override.sh b/deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh similarity index 100% rename from deployments/examples/ocis_full/config/onlyoffice/entrypoint-override.sh rename to deployments/examples/opencloud_full/config/onlyoffice/entrypoint-override.sh diff --git a/deployments/examples/ocis_full/config/onlyoffice/local.json b/deployments/examples/opencloud_full/config/onlyoffice/local.json similarity index 100% rename from deployments/examples/ocis_full/config/onlyoffice/local.json rename to deployments/examples/opencloud_full/config/onlyoffice/local.json diff --git a/deployments/examples/ocis_full/config/ocis/app-registry.yaml b/deployments/examples/opencloud_full/config/opencloud/app-registry.yaml similarity index 100% rename from deployments/examples/ocis_full/config/ocis/app-registry.yaml rename to deployments/examples/opencloud_full/config/opencloud/app-registry.yaml diff --git a/deployments/examples/ocis_full/config/ocis/apps.yaml b/deployments/examples/opencloud_full/config/opencloud/apps.yaml similarity index 100% rename from deployments/examples/ocis_full/config/ocis/apps.yaml rename to deployments/examples/opencloud_full/config/opencloud/apps.yaml diff --git a/deployments/examples/ocis_full/config/ocis/banned-password-list.txt b/deployments/examples/opencloud_full/config/opencloud/banned-password-list.txt similarity index 100% rename from deployments/examples/ocis_full/config/ocis/banned-password-list.txt rename to deployments/examples/opencloud_full/config/opencloud/banned-password-list.txt diff --git a/deployments/examples/ocis_full/config/ocis/csp.yaml b/deployments/examples/opencloud_full/config/opencloud/csp.yaml similarity index 100% rename from deployments/examples/ocis_full/config/ocis/csp.yaml rename to deployments/examples/opencloud_full/config/opencloud/csp.yaml diff --git a/deployments/examples/ocis_full/debug-collaboration-collabora.yml b/deployments/examples/opencloud_full/debug-collaboration-collabora.yml similarity index 82% rename from deployments/examples/ocis_full/debug-collaboration-collabora.yml rename to deployments/examples/opencloud_full/debug-collaboration-collabora.yml index 0ba450a73c..272128656d 100644 --- a/deployments/examples/ocis_full/debug-collaboration-collabora.yml +++ b/deployments/examples/opencloud_full/debug-collaboration-collabora.yml @@ -2,7 +2,7 @@ services: collaboration: - command: [ "-c", "dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ] + command: [ "-c", "dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/opencloud collaboration server" ] environment: COLLABORATION_LOG_LEVEL: debug ports: diff --git a/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml b/deployments/examples/opencloud_full/debug-collaboration-onlyoffice.yml similarity index 82% rename from deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml rename to deployments/examples/opencloud_full/debug-collaboration-onlyoffice.yml index ce6e7aa7f8..452fae66e1 100644 --- a/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml +++ b/deployments/examples/opencloud_full/debug-collaboration-onlyoffice.yml @@ -2,7 +2,7 @@ services: collaboration-oo: - command: [ "-c", "dlv --listen=:40002 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ] + command: [ "-c", "dlv --listen=:40002 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/opencloud collaboration server" ] environment: COLLABORATION_LOG_LEVEL: debug ports: diff --git a/deployments/examples/opencloud_full/debug-ocis.yml b/deployments/examples/opencloud_full/debug-ocis.yml new file mode 100644 index 0000000000..1304597ba9 --- /dev/null +++ b/deployments/examples/opencloud_full/debug-ocis.yml @@ -0,0 +1,7 @@ +--- +services: + + opencloud: + command: [ "-c", "opencloud init || true; dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/opencloud server" ] + ports: + - 40000:40000 diff --git a/deployments/examples/ocis_full/docker-compose.yml b/deployments/examples/opencloud_full/docker-compose.yml similarity index 98% rename from deployments/examples/ocis_full/docker-compose.yml rename to deployments/examples/opencloud_full/docker-compose.yml index 5e9df42c32..3c6eaf867a 100644 --- a/deployments/examples/ocis_full/docker-compose.yml +++ b/deployments/examples/opencloud_full/docker-compose.yml @@ -4,7 +4,7 @@ services: image: traefik:v3.3.1 # release notes: https://github.com/traefik/traefik/releases networks: - ocis-net: + opencloud-net: command: - "--log.level=${TRAEFIK_LOG_LEVEL:-ERROR}" # letsencrypt configuration @@ -54,4 +54,4 @@ volumes: certs: networks: - ocis-net: + opencloud-net: diff --git a/deployments/examples/ocis_full/inbucket.yml b/deployments/examples/opencloud_full/inbucket.yml similarity index 88% rename from deployments/examples/ocis_full/inbucket.yml rename to deployments/examples/opencloud_full/inbucket.yml index d4a89e235a..3a8e99c482 100644 --- a/deployments/examples/ocis_full/inbucket.yml +++ b/deployments/examples/opencloud_full/inbucket.yml @@ -1,11 +1,11 @@ --- services: - ocis: + opencloud: environment: NOTIFICATIONS_SMTP_HOST: inbucket NOTIFICATIONS_SMTP_PORT: 2500 - NOTIFICATIONS_SMTP_SENDER: oCIS notifications - NOTIFICATIONS_SMTP_USERNAME: notifications@${OC_DOMAIN:-ocis.owncloud.test} + NOTIFICATIONS_SMTP_SENDER: oCIS notifications + NOTIFICATIONS_SMTP_USERNAME: notifications@${OC_DOMAIN:-drive.opencloud.test} # the mail catcher uses self signed certificates NOTIFICATIONS_SMTP_INSECURE: "true" @@ -13,7 +13,7 @@ services: image: inbucket/inbucket # changelog: https://github.com/inbucket/inbucket/blob/main/CHANGELOG.md networks: - - ocis-net + - opencloud-net entrypoint: - /bin/sh command: [ "-c", "apk add openssl; openssl req -subj '/CN=inbucket.test' -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/server.key -out /tmp/server.crt; /start-inbucket.sh" ] diff --git a/deployments/examples/ocis_full/minio.yml b/deployments/examples/opencloud_full/minio.yml similarity index 74% rename from deployments/examples/ocis_full/minio.yml rename to deployments/examples/opencloud_full/minio.yml index fb650aba93..07d067efaa 100644 --- a/deployments/examples/ocis_full/minio.yml +++ b/deployments/examples/opencloud_full/minio.yml @@ -4,19 +4,19 @@ services: image: minio/minio:latest # release notes: https://github.com/minio/minio/releases networks: - ocis-net: + opencloud-net: entrypoint: - /bin/sh command: [ "-c", - "mkdir -p /data/${S3NG_BUCKET:-ocis-bucket} && minio server --console-address ':9001' /data", + "mkdir -p /data/${S3NG_BUCKET:-opencloud-bucket} && minio server --console-address ':9001' /data", ] volumes: - minio-data:/data environment: - MINIO_ACCESS_KEY: ${S3NG_ACCESS_KEY:-ocis} - MINIO_SECRET_KEY: ${S3NG_SECRET_KEY:-ocis-secret-key} + MINIO_ACCESS_KEY: ${S3NG_ACCESS_KEY:-opencloud} + MINIO_SECRET_KEY: ${S3NG_SECRET_KEY:-opencloud-secret-key} labels: - "traefik.enable=true" - "traefik.http.routers.minio.entrypoints=https" diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml b/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml similarity index 95% rename from deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml rename to deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml index cc883dc354..0ead76a5dc 100644 --- a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml +++ b/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml @@ -1,7 +1,7 @@ --- services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -22,5 +22,5 @@ services: COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml b/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml similarity index 95% rename from deployments/examples/ocis_full/monitoring_tracing/monitoring.yml rename to deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml index 7258a2d9e5..a8b0eed8d2 100644 --- a/deployments/examples/ocis_full/monitoring_tracing/monitoring.yml +++ b/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml @@ -1,7 +1,7 @@ --- services: - ocis: + opencloud: environment: # tracing OC_TRACING_ENABLED: "true" @@ -22,5 +22,5 @@ services: COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 networks: - ocis-net: + opencloud-net: external: true diff --git a/deployments/examples/ocis_full/ocis.yml b/deployments/examples/opencloud_full/ocis.yml similarity index 60% rename from deployments/examples/ocis_full/ocis.yml rename to deployments/examples/opencloud_full/ocis.yml index 91726ab074..1e54c538d6 100644 --- a/deployments/examples/ocis_full/ocis.yml +++ b/deployments/examples/opencloud_full/ocis.yml @@ -2,25 +2,25 @@ services: traefik: networks: - ocis-net: + opencloud-net: aliases: - - ${OC_DOMAIN:-ocis.owncloud.test} - ocis: - image: ${OC_DOCKER_IMAGE:-owncloud/ocis}:${OC_DOCKER_TAG:-latest} - # changelog: https://github.com/owncloud/ocis/tree/master/changelog - # release notes: https://doc.owncloud.com/ocis_release_notes.html + - ${OC_DOMAIN:-drive.opencloud.test} + opencloud: + image: ${OC_DOCKER_IMAGE:-opencloud-eu/opencloud}:${OC_DOCKER_TAG:-latest} + # changelog: https://github.com/opencloud-eu/opencloud/tree/master/changelog + # release notes: https://doc.owncloud.com/opencloud_release_notes.html networks: - ocis-net: + opencloud-net: entrypoint: - /bin/sh - # run ocis init to initialize a configuration file with random secrets + # run opencloud 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"] + # therefore we ignore the error and then start the opencloud server + command: ["-c", "opencloud init || true; opencloud server"] environment: # enable services that are not started automatically OC_ADD_RUN_SERVICES: ${START_ADDITIONAL_SERVICES} - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} OC_LOG_LEVEL: ${LOG_LEVEL:-info} OC_LOG_COLOR: "${LOG_PRETTY:-false}" OC_LOG_PRETTY: "${LOG_PRETTY:-false}" @@ -39,14 +39,14 @@ services: # email server (if configured) NOTIFICATIONS_SMTP_HOST: "${SMTP_HOST}" NOTIFICATIONS_SMTP_PORT: "${SMTP_PORT}" - NOTIFICATIONS_SMTP_SENDER: "${SMTP_SENDER:-oCIS notifications }" + NOTIFICATIONS_SMTP_SENDER: "${SMTP_SENDER:-oCIS notifications }" NOTIFICATIONS_SMTP_USERNAME: "${SMTP_USERNAME}" NOTIFICATIONS_SMTP_INSECURE: "${SMTP_INSECURE}" # make the registry available to the app provider containers MICRO_REGISTRY_ADDRESS: 127.0.0.1:9233 NATS_NATS_HOST: 0.0.0.0 NATS_NATS_PORT: 9233 - PROXY_CSP_CONFIG_FILE_LOCATION: /etc/ocis/csp.yaml + PROXY_CSP_CONFIG_FILE_LOCATION: /etc/opencloud/csp.yaml # these three vars are needed to the csp config file to include the web office apps and the importer COLLABORA_DOMAIN: ${COLLABORA_DOMAIN:-collabora.owncloud.test} ONLYOFFICE_DOMAIN: ${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test} @@ -54,23 +54,23 @@ services: # enable to allow using the banned passwords list OC_PASSWORD_POLICY_BANNED_PASSWORDS_LIST: banned-password-list.txt volumes: - - ./config/ocis/app-registry.yaml:/etc/ocis/app-registry.yaml - - ./config/ocis/csp.yaml:/etc/ocis/csp.yaml - - ./config/ocis/banned-password-list.txt:/etc/ocis/banned-password-list.txt + - ./config/opencloud/app-registry.yaml:/etc/opencloud/app-registry.yaml + - ./config/opencloud/csp.yaml:/etc/opencloud/csp.yaml + - ./config/opencloud/banned-password-list.txt:/etc/opencloud/banned-password-list.txt # configure the .env file to use own paths instead of docker internal volumes - - ${OC_CONFIG_DIR:-ocis-config}:/etc/ocis - - ${OC_DATA_DIR:-ocis-data}:/var/lib/ocis + - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud + - ${OC_DATA_DIR:-opencloud-data}:/var/lib/opencloud labels: - "traefik.enable=true" - - "traefik.http.routers.ocis.entrypoints=https" - - "traefik.http.routers.ocis.rule=Host(`${OC_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" + - "traefik.http.routers.opencloud.entrypoints=https" + - "traefik.http.routers.opencloud.rule=Host(`${OC_DOMAIN:-drive.opencloud.test}`)" + - "traefik.http.routers.opencloud.tls.certresolver=http" + - "traefik.http.routers.opencloud.service=opencloud" + - "traefik.http.services.opencloud.loadbalancer.server.port=9200" logging: driver: ${LOG_DRIVER:-local} restart: always volumes: - ocis-config: - ocis-data: + opencloud-config: + opencloud-data: diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/opencloud_full/onlyoffice.yml similarity index 90% rename from deployments/examples/ocis_full/onlyoffice.yml rename to deployments/examples/opencloud_full/onlyoffice.yml index 7d55b2081a..d2aa760264 100644 --- a/deployments/examples/ocis_full/onlyoffice.yml +++ b/deployments/examples/opencloud_full/onlyoffice.yml @@ -2,28 +2,28 @@ services: traefik: networks: - ocis-net: + opencloud-net: aliases: - ${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test} - ${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test} collaboration-oo: - image: ${OC_DOCKER_IMAGE:-owncloud/ocis}:${OC_DOCKER_TAG:-latest} + image: ${OC_DOCKER_IMAGE:-opencloud-eu/opencloud}:${OC_DOCKER_TAG:-latest} networks: - ocis-net: + opencloud-net: depends_on: - ocis: + opencloud: condition: service_started onlyoffice: condition: service_healthy entrypoint: - /bin/sh - command: [ "-c", "ocis collaboration server" ] + command: [ "-c", "opencloud collaboration server" ] environment: COLLABORATION_GRPC_ADDR: 0.0.0.0:9301 COLLABORATION_HTTP_ADDR: 0.0.0.0:9300 MICRO_REGISTRY: "nats-js-kv" - MICRO_REGISTRY_ADDRESS: "ocis:9233" + MICRO_REGISTRY_ADDRESS: "opencloud:9233" COLLABORATION_WOPI_SRC: https://${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test} COLLABORATION_APP_NAME: "OnlyOffice" COLLABORATION_APP_PRODUCT: "OnlyOffice" @@ -33,10 +33,10 @@ services: COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}" COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info} COLLABORATION_APP_PROOF_DISABLE: "true" - OC_URL: https://${OC_DOMAIN:-ocis.owncloud.test} + OC_URL: https://${OC_DOMAIN:-drive.opencloud.test} volumes: # configure the .env file to use own paths instead of docker internal volumes - - ${OC_CONFIG_DIR:-ocis-config}:/etc/ocis + - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud labels: - "traefik.enable=true" - "traefik.http.routers.collaboration-oo.entrypoints=https" @@ -54,7 +54,7 @@ services: image: onlyoffice/documentserver:8.2.2 # changelog https://github.com/ONLYOFFICE/DocumentServer/releases networks: - ocis-net: + opencloud-net: entrypoint: - /bin/sh - /entrypoint-override.sh diff --git a/deployments/examples/opencloud_full/s3ng.yml b/deployments/examples/opencloud_full/s3ng.yml new file mode 100644 index 0000000000..d9f9fec309 --- /dev/null +++ b/deployments/examples/opencloud_full/s3ng.yml @@ -0,0 +1,14 @@ +--- +services: + opencloud: + environment: + # activate s3ng storage driver + STORAGE_USERS_DRIVER: s3ng + # keep system data on opencloud storage since this are only small files atm + STORAGE_SYSTEM_DRIVER: ocis + # s3ng specific settings + STORAGE_USERS_S3NG_ENDPOINT: ${S3NG_ENDPOINT:-http://minio:9000} + STORAGE_USERS_S3NG_REGION: ${S3NG_REGION:-default} + STORAGE_USERS_S3NG_ACCESS_KEY: ${S3NG_ACCESS_KEY:-opencloud} + STORAGE_USERS_S3NG_SECRET_KEY: ${S3NG_SECRET_KEY:-opencloud-secret-key} + STORAGE_USERS_S3NG_BUCKET: ${S3NG_BUCKET:-opencloud-bucket} diff --git a/deployments/examples/ocis_full/tika.yml b/deployments/examples/opencloud_full/tika.yml similarity index 91% rename from deployments/examples/ocis_full/tika.yml rename to deployments/examples/opencloud_full/tika.yml index 70206a3f02..081f2876b5 100644 --- a/deployments/examples/ocis_full/tika.yml +++ b/deployments/examples/opencloud_full/tika.yml @@ -4,12 +4,12 @@ services: image: ${TIKA_IMAGE:-apache/tika:latest-full} # release notes: https://tika.apache.org networks: - ocis-net: + opencloud-net: restart: always logging: driver: ${LOG_DRIVER:-local} - ocis: + opencloud: environment: # fulltext search SEARCH_EXTRACTOR_TYPE: tika diff --git a/deployments/examples/ocis_full/web_extensions/drawio.yml b/deployments/examples/opencloud_full/web_extensions/drawio.yml similarity index 71% rename from deployments/examples/ocis_full/web_extensions/drawio.yml rename to deployments/examples/opencloud_full/web_extensions/drawio.yml index 4aa56ed869..c2e635cbbe 100644 --- a/deployments/examples/ocis_full/web_extensions/drawio.yml +++ b/deployments/examples/opencloud_full/web_extensions/drawio.yml @@ -1,15 +1,15 @@ --- services: - ocis: + opencloud: depends_on: drawio-init: condition: service_completed_successfully drawio-init: - image: owncloud/web-extensions:draw-io-0.3.0 + image: opencloud-eu/web-extensions:draw-io-0.3.0 user: root volumes: - - ocis-apps:/apps + - opencloud-apps:/apps entrypoint: - /bin/sh command: ["-c", "cp -R /var/lib/nginx/html/draw-io/ /apps"] diff --git a/deployments/examples/opencloud_full/web_extensions/extensions.yml b/deployments/examples/opencloud_full/web_extensions/extensions.yml new file mode 100644 index 0000000000..babeebc04f --- /dev/null +++ b/deployments/examples/opencloud_full/web_extensions/extensions.yml @@ -0,0 +1,7 @@ +services: + opencloud: + volumes: + - opencloud-apps:/var/lib/opencloud/web/assets/apps + +volumes: + opencloud-apps: diff --git a/deployments/examples/ocis_full/web_extensions/externalsites.yml b/deployments/examples/opencloud_full/web_extensions/externalsites.yml similarity index 71% rename from deployments/examples/ocis_full/web_extensions/externalsites.yml rename to deployments/examples/opencloud_full/web_extensions/externalsites.yml index a002f9d9b9..db1b57fd95 100644 --- a/deployments/examples/ocis_full/web_extensions/externalsites.yml +++ b/deployments/examples/opencloud_full/web_extensions/externalsites.yml @@ -1,15 +1,15 @@ --- services: - ocis: + opencloud: depends_on: externalsites-init: condition: service_completed_successfully externalsites-init: - image: owncloud/web-extensions:external-sites-0.3.0 + image: opencloud-eu/web-extensions:external-sites-0.3.0 user: root volumes: - - ocis-apps:/apps + - opencloud-apps:/apps entrypoint: - /bin/sh command: ["-c", "cp -R /var/lib/nginx/html/external-sites/ /apps"] diff --git a/deployments/examples/ocis_full/web_extensions/importer.yml b/deployments/examples/opencloud_full/web_extensions/importer.yml similarity index 83% rename from deployments/examples/ocis_full/web_extensions/importer.yml rename to deployments/examples/opencloud_full/web_extensions/importer.yml index d062d358b3..f3e529ce6b 100644 --- a/deployments/examples/ocis_full/web_extensions/importer.yml +++ b/deployments/examples/opencloud_full/web_extensions/importer.yml @@ -2,22 +2,22 @@ services: traefik: networks: - ocis-net: + opencloud-net: aliases: - ${COMPANION_DOMAIN:-companion.owncloud.test} - ocis: + opencloud: volumes: # the cloud importer needs to be enabled in the web.yaml - - ./config/ocis/apps.yaml:/etc/ocis/apps.yaml + - ./config/opencloud/apps.yaml:/etc/opencloud/apps.yaml depends_on: importer-init: condition: service_completed_successfully importer-init: - image: owncloud/web-extensions:importer-0.1.0 + image: opencloud-eu/web-extensions:importer-0.1.0 user: root volumes: - - ocis-apps:/apps + - opencloud-apps:/apps entrypoint: - /bin/sh command: [ "-c", "cp -R /var/lib/nginx/html/importer/ /apps" ] @@ -25,14 +25,14 @@ services: companion: image: ${COMPANION_IMAGE:-owncloud/uppy-companion:3.12.13-owncloud} networks: - - ocis-net + - opencloud-net environment: NODE_ENV: production NODE_TLS_REJECT_UNAUTHORIZED: 0 COMPANION_DATADIR: /tmp/companion/ COMPANION_DOMAIN: ${COMPANION_DOMAIN:-companion.owncloud.test} COMPANION_PROTOCOL: https - COMPANION_UPLOAD_URLS: "^https://${OC_DOMAIN:-ocis.owncloud.test}/" + COMPANION_UPLOAD_URLS: "^https://${OC_DOMAIN:-drive.opencloud.test}/" COMPANION_ONEDRIVE_KEY: "${COMPANION_ONEDRIVE_KEY}" COMPANION_ONEDRIVE_SECRET: "${COMPANION_ONEDRIVE_SECRET}" volumes: diff --git a/deployments/examples/ocis_full/web_extensions/jsonviewer.yml b/deployments/examples/opencloud_full/web_extensions/jsonviewer.yml similarity index 71% rename from deployments/examples/ocis_full/web_extensions/jsonviewer.yml rename to deployments/examples/opencloud_full/web_extensions/jsonviewer.yml index 3e4ee9e917..a482d7861b 100644 --- a/deployments/examples/ocis_full/web_extensions/jsonviewer.yml +++ b/deployments/examples/opencloud_full/web_extensions/jsonviewer.yml @@ -1,15 +1,15 @@ --- services: - ocis: + opencloud: depends_on: jsonviewer-init: condition: service_completed_successfully jsonviewer-init: - image: owncloud/web-extensions:json-viewer-0.3.0 + image: opencloud-eu/web-extensions:json-viewer-0.3.0 user: root volumes: - - ocis-apps:/apps + - opencloud-apps:/apps entrypoint: - /bin/sh command: ["-c", "cp -R /var/lib/nginx/html/json-viewer/ /apps"] diff --git a/deployments/examples/ocis_full/web_extensions/progressbars.yml b/deployments/examples/opencloud_full/web_extensions/progressbars.yml similarity index 79% rename from deployments/examples/ocis_full/web_extensions/progressbars.yml rename to deployments/examples/opencloud_full/web_extensions/progressbars.yml index 32315fbeea..668a7a867c 100644 --- a/deployments/examples/ocis_full/web_extensions/progressbars.yml +++ b/deployments/examples/opencloud_full/web_extensions/progressbars.yml @@ -1,12 +1,12 @@ --- services: - ocis: + opencloud: depends_on: progressbars-init: condition: service_completed_successfully progressbars-init: - image: owncloud/web-extensions:progress-bars-0.3.0 + image: opencloud-eu/web-extensions:progress-bars-0.3.0 user: root volumes: - ocis-apps:/apps diff --git a/deployments/examples/ocis_full/web_extensions/unzip.yml b/deployments/examples/opencloud_full/web_extensions/unzip.yml similarity index 71% rename from deployments/examples/ocis_full/web_extensions/unzip.yml rename to deployments/examples/opencloud_full/web_extensions/unzip.yml index 78a7ffe307..5bb0db1e24 100644 --- a/deployments/examples/ocis_full/web_extensions/unzip.yml +++ b/deployments/examples/opencloud_full/web_extensions/unzip.yml @@ -1,15 +1,15 @@ --- services: - ocis: + opencloud: depends_on: unzip-init: condition: service_completed_successfully unzip-init: - image: owncloud/web-extensions:unzip-0.4.0 + image: opencloud-eu/web-extensions:unzip-0.4.0 user: root volumes: - - ocis-apps:/apps + - opencloud-apps:/apps entrypoint: - /bin/sh command: ["-c", "cp -R /var/lib/nginx/html/unzip/ /apps"] diff --git a/docs/ocis/deployment/ocis_full.md b/docs/ocis/deployment/ocis_full.md index 15a5daa043..88b4851d6d 100644 --- a/docs/ocis/deployment/ocis_full.md +++ b/docs/ocis/deployment/ocis_full.md @@ -4,7 +4,7 @@ date: 2024-06-25T00:00:00+01:00 weight: 24 geekdocRepo: https://github.com/owncloud/ocis geekdocEditPath: edit/master/docs/ocis/deployment -geekdocFilePath: ocis_full.md +geekdocFilePath: opencloud_full.md --- {{< toc >}} diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml index 73919efea7..1b81c30c49 100644 --- a/tests/acceptance/docker/src/acceptance.yml +++ b/tests/acceptance/docker/src/acceptance.yml @@ -5,8 +5,8 @@ services: command: /bin/bash /test/run-tests.sh environment: OC_ROOT: /drone/src - TEST_SERVER_URL: https://ocis-server:9200 - OC_WRAPPER_URL: http://ocis-server:5200 + TEST_SERVER_URL: https://opencloud-server:9200 + OC_WRAPPER_URL: http://opencloud-server:5200 STORAGE_DRIVER: $STORAGE_DRIVER TEST_SOURCE: $TEST_SOURCE BEHAT_SUITE: ${BEHAT_SUITE:-} diff --git a/tests/acceptance/docker/src/ocis-base.yml b/tests/acceptance/docker/src/ocis-base.yml index 521a4559b9..562bc5aa9e 100644 --- a/tests/acceptance/docker/src/ocis-base.yml +++ b/tests/acceptance/docker/src/ocis-base.yml @@ -1,21 +1,21 @@ services: - ocis-server: + opencloud-server: build: - dockerfile: ocis.Dockerfile + dockerfile: opencloud.Dockerfile context: ./ args: OC_IMAGE_TAG: $OC_IMAGE_TAG user: root environment: WITH_WRAPPER: $WITH_WRAPPER - OC_URL: "https://ocis-server:9200" + OC_URL: "https://opencloud-server:9200" STORAGE_USERS_DRIVER: $STORAGE_DRIVER - STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/ocis/local/root - STORAGE_USERS_DRIVER_OC_ROOT: /srv/app/tmp/ocis/storage/users - STORAGE_SYSTEM_DRIVER_OC_ROOT: /srv/app/tmp/ocis/storage/metadata - SHARING_USER_JSON_FILE: /srv/app/tmp/ocis/shares.json + STORAGE_USERS_DRIVER_LOCAL_ROOT: /srv/app/tmp/opencloud/local/root + STORAGE_USERS_DRIVER_OC_ROOT: /srv/app/tmp/opencloud/storage/users + STORAGE_SYSTEM_DRIVER_OC_ROOT: /srv/app/tmp/opencloud/storage/metadata + SHARING_USER_JSON_FILE: /srv/app/tmp/opencloud/shares.json PROXY_ENABLE_BASIC_AUTH: "true" - WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/ocis-config.json + WEB_UI_CONFIG_FILE: /drone/src/tests/config/drone/opencloud-config.json ACCOUNTS_HASH_DIFFICULTY: 4 OC_INSECURE: "true" IDM_CREATE_DEMO_USERS: "true" @@ -52,4 +52,4 @@ services: THUMBNAILS_TXT_FONTMAP_FILE: "/drone/src/tests/config/drone/fontsMap.json" volumes: - ../../../config:/drone/src/tests/config - - ../../../ociswrapper/bin/ociswrapper:/usr/bin/ociswrapper + - ../../../opencloudwrapper/bin/opencloudwrapper:/usr/bin/opencloudwrapper