From 8d0e4bf64b10c7c89fcce8429a989538d636ff7c Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 8 Jun 2023 22:08:03 +0200 Subject: [PATCH 1/2] Bump version --- ocis-pkg/version/version.go | 2 +- sonar-project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go index a5af4cd1e5..604f4b00cd 100644 --- a/ocis-pkg/version/version.go +++ b/ocis-pkg/version/version.go @@ -16,7 +16,7 @@ var ( // LatestTag is the latest released version plus the dev meta version. // Will be overwritten by the release pipeline // Needs a manual change for every tagged release - LatestTag = "3.0.0+dev" + LatestTag = "3.1.0-next.1+dev" // Date indicates the build date. // This has been removed, it looks like you can only replace static strings with recent go versions diff --git a/sonar-project.properties b/sonar-project.properties index a0a49434eb..1b4cc1236c 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=owncloud_ocis sonar.organization=owncloud-1 sonar.projectName=ocis -sonar.projectVersion=3.0.0 +sonar.projectVersion=3.1.0-next.1 sonar.host.url=https://sonarcloud.io # ===================================================== From a86aba1c4144d54d80fd956ddcb9139518cbfc04 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 8 Jun 2023 22:08:54 +0200 Subject: [PATCH 2/2] Adapt example deployment --- .../examples/ocis_wopi/docker-compose.yml | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index d14c1f8bef..e36203b849 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -82,6 +82,8 @@ services: NOTIFICATIONS_SMTP_SENDER: oCIS notifications NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test} NOTIFICATIONS_SMTP_INSECURE: "true" # the mail catcher uses self signed certificates + # make the registry available to the app provider containers + MICRO_REGISTRY: "mdns" volumes: - ./config/ocis/app-registry.yaml:/etc/ocis/app-registry.yaml - ocis-config:/etc/ocis @@ -103,9 +105,13 @@ services: ocis-net: command: app-provider server environment: - REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} + # use the internal service name of the gateway + REVA_GATEWAY: ${REVA_GATEWAY:-com.owncloud.api.gateway} APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_EXTERNAL_ADDR: ocis-appprovider-collabora:9164 + # configure the service name to avoid collision with onlyoffice + APP_PROVIDER_SERVICE_NAME: app-provider-collabora + # use the internal service name + APP_PROVIDER_EXTERNAL_ADDR: com.owncloud.api.app-provider-collabora APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_APP_NAME: Collabora APP_PROVIDER_WOPI_APP_ICON_URI: https://${COLLABORA_DOMAIN:-collabora.owncloud.test}/favicon.ico @@ -113,6 +119,8 @@ services: APP_PROVIDER_WOPI_INSECURE: "${INSECURE:-false}" APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test} APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} + # share the registry with the ocis container + MICRO_REGISTRY: "mdns" volumes: - ocis-config:/etc/ocis logging: @@ -129,9 +137,13 @@ services: - /entrypoint-override.sh #command: app-provider server environment: - REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} + # use the internal service name of the gateway + REVA_GATEWAY: ${REVA_GATEWAY:-com.owncloud.api.gateway} APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_EXTERNAL_ADDR: ocis-appprovider-onlyoffice:9164 + # configure the service name to avoid collision with collabora + APP_PROVIDER_SERVICE_NAME: app-provider-onlyoffice + # use the internal service name + APP_PROVIDER_EXTERNAL_ADDR: com.owncloud.api.app-provider-onlyoffice APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_APP_NAME: OnlyOffice APP_PROVIDER_WOPI_APP_ICON_URI: https://${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test}/web-apps/apps/documenteditor/main/resources/img/favicon.ico @@ -139,6 +151,8 @@ services: APP_PROVIDER_WOPI_INSECURE: "${INSECURE:-false}" APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test} APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} + # share the registry with the ocis container + MICRO_REGISTRY: "mdns" volumes: - ./config/ocis-appprovider-onlyoffice/entrypoint-override.sh:/entrypoint-override.sh - ocis-config:/etc/ocis