quick fix for breaking changes in postgres 18 by pinning to 17

idm/ldap-keycloak.yml

@@ -65,7 +65,7 @@ services:
     restart: always
 
   postgres:
-    image: postgres:alpine
+    image: postgres:17-alpine
     networks:
       opencloud-net:
     volumes:

testing/external-keycloak.yml

@@ -1,7 +1,7 @@
 ---
 services:
   postgres:
-    image: postgres:alpine
+    image: postgres:17-alpine
     networks:
       opencloud-net:
     volumes:

traefik/collabora.yml

@@ -6,14 +6,14 @@ services:
         aliases:
           - ${COLLABORA_DOMAIN:-collabora.opencloud.test}
           - ${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}
-#  collaboration:
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.collaboration.entrypoints=https"
-#      - "traefik.http.routers.collaboration.rule=Host(`${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}`)"
-#      - "traefik.http.routers.collaboration.${TRAEFIK_SERVICES_TLS_CONFIG}"
-#      - "traefik.http.routers.collaboration.service=collaboration"
-#      - "traefik.http.services.collaboration.loadbalancer.server.port=9300"
+  collaboration:
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.collaboration.entrypoints=https"
+      - "traefik.http.routers.collaboration.rule=Host(`${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}`)"
+      - "traefik.http.routers.collaboration.${TRAEFIK_SERVICES_TLS_CONFIG}"
+      - "traefik.http.routers.collaboration.service=collaboration"
+      - "traefik.http.services.collaboration.loadbalancer.server.port=9300"
   collabora:
     labels:
       - "traefik.enable=true"

weboffice/collabora.yml

@@ -6,14 +6,30 @@ services:
       # this is needed for setting the correct CSP header
       COLLABORA_DOMAIN: ${COLLABORA_DOMAIN:-collabora.opencloud.test}
       # expose nats and the reva gateway for the collaboration service
-      # NATS_NATS_HOST: 0.0.0.0
-      # GATEWAY_GRPC_ADDR: 0.0.0.0:9142
+      NATS_NATS_HOST: 0.0.0.0
+      GATEWAY_GRPC_ADDR: 0.0.0.0:9142
       # make collabora the secure view app
-      FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.api.collaboration
+      FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.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_GRPC_ADDR: 0.0.0.0:9301
-      # COLLABORATION_HTTP_ADDR: 0.0.0.0:9300
-      COLLABORATION_WOPI_SRC: https://${OC_DOMAIN:-cloud.opencloud.test}
+
+  collaboration:
+    image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-latest}
+    networks:
+      opencloud-net:
+    depends_on:
+      opencloud:
+        condition: service_started
+      collabora:
+        condition: service_healthy
+    entrypoint:
+      - /bin/sh
+    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: "opencloud:9233"
+      COLLABORATION_WOPI_SRC: https://${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}
       COLLABORATION_APP_NAME: "CollaboraOnline"
       COLLABORATION_APP_PRODUCT: "Collabora"
       COLLABORATION_APP_ADDR: https://${COLLABORA_DOMAIN:-collabora.opencloud.test}
@@ -21,39 +37,13 @@ services:
       COLLABORATION_APP_INSECURE: "${INSECURE:-true}"
       COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}"
       COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info}
-
-#  collaboration:
-#    image: ${OC_DOCKER_IMAGE:-opencloudeu/opencloud-rolling}:${OC_DOCKER_TAG:-latest}
-#    networks:
-#      opencloud-net:
-#    depends_on:
-#      opencloud:
-#        condition: service_started
-#      collabora:
-#        condition: service_healthy
-#    entrypoint:
-#      - /bin/sh
-#    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: "opencloud:9233"
-#      COLLABORATION_WOPI_SRC: https://${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}
-#      COLLABORATION_APP_NAME: "CollaboraOnline"
-#      COLLABORATION_APP_PRODUCT: "Collabora"
-#      COLLABORATION_APP_ADDR: https://${COLLABORA_DOMAIN:-collabora.opencloud.test}
-#      COLLABORATION_APP_ICON: https://${COLLABORA_DOMAIN:-collabora.opencloud.test}/favicon.ico
-#      COLLABORATION_APP_INSECURE: "${INSECURE:-true}"
-#      COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}"
-#      COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info}
-#      OC_URL: https://${OC_DOMAIN:-cloud.opencloud.test}
-#    volumes:
-#      # configure the .env file to use own paths instead of docker internal volumes
-#      - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud
-#    logging:
-#      driver: ${LOG_DRIVER:-local}
-#    restart: always
+      OC_URL: https://${OC_DOMAIN:-cloud.opencloud.test}
+    volumes:
+      # configure the .env file to use own paths instead of docker internal volumes
+      - ${OC_CONFIG_DIR:-opencloud-config}:/etc/opencloud
+    logging:
+      driver: ${LOG_DRIVER:-local}
+    restart: always
 
   collabora:
     image: collabora/code:25.04.4.2.1
@@ -61,7 +51,7 @@ services:
     networks:
       opencloud-net:
     environment:
-      aliasgroup1: https://${OC_DOMAIN:-cloud.opencloud.test}:443
+      aliasgroup1: https://${WOPISERVER_DOMAIN:-wopiserver.opencloud.test}:443
       DONT_GEN_SSL_CERT: "YES"
       extra_params: |
         --o:ssl.enable=${COLLABORA_SSL_ENABLE:-true} \