chore: bump collabora to collabora/code:25.04.4.2.1

Merge pull request #78 from opencloud-eu/fix_ldap_keycloak_password
add ENV:LDAP_ADMIN_PASSWORD to keycloak container
2026-06-08 12:10:05 +08:00 · 2025-08-20 11:23:53 +02:00 · 2025-08-20 09:04:36 +02:00 · 2025-08-19 16:53:38 +02:00 · 2025-08-07 18:11:41 +02:00
4 changed files with 4 additions and 18 deletions
--- a/.env.example
+++ b/.env.example
@@ -177,8 +177,8 @@ START_ADDITIONAL_SERVICES="notifications"
 # Tika (search) is disabled by default due to performance reasons.
 # Tika is used to extract metadata and text from various file formats.
 # Enable it by adding the following to the COMPOSE_FILE variable:
-# tika/tika.yml or by using the following command:
-# docker compose -f docker-compose.yml -f tika/tika.yml up -d
+# search/tika.yml or by using the following command:
+# docker compose -f docker-compose.yml -f search/tika.yml up -d
 # Set the desired docker image tag or digest.
 # Defaults to "apache/tika:latest-full"
 TIKA_IMAGE=
--- a/config/keycloak/opencloud-realm.dist.json
+++ b/config/keycloak/opencloud-realm.dist.json
@@ -1952,21 +1952,6 @@
          ]
        }
      },
-      {
-        "id": "c016f2b3-cf74-410e-a852-f6c7b49e0f5a",
-        "name": "Block Client Registration",
-        "providerId": "trusted-hosts",
-        "subType": "anonymous",
-        "subComponents": {},
-        "config": {
-          "host-sending-registration-request-must-match": [
-            "true"
-          ],
-          "client-uris-must-match": [
-            "true"
-          ]
-        }
-      },
      {
        "id": "5a9aef85-98a6-4e90-b30f-8aa715e1f5e6",
        "name": "Allowed Protocol Mapper Types",
--- a/idm/ldap-keycloak.yml
+++ b/idm/ldap-keycloak.yml
@@ -89,6 +89,7 @@ services:
      - "./config/keycloak/opencloud-realm.dist.json:/opt/keycloak/data/import-dist/opencloud-realm.json"
      - "./config/keycloak/themes/opencloud:/opt/keycloak/themes/opencloud"
    environment:
+      LDAP_ADMIN_PASSWORD: ${LDAP_BIND_PASSWORD:-admin}
      OC_DOMAIN: ${OC_DOMAIN:-cloud.opencloud.test}
      KC_HOSTNAME: ${KEYCLOAK_DOMAIN:-keycloak.opencloud.test}
      KC_DB: postgres
--- a/weboffice/collabora.yml
+++ b/weboffice/collabora.yml
@@ -46,7 +46,7 @@ services:
    restart: always

  collabora:
-    image: collabora/code:25.04.1.1.1
+    image: collabora/code:25.04.4.2.1
    # release notes: https://www.collaboraonline.com/release-notes/
    networks:
      opencloud-net:
Author	SHA1	Message	Date
Alexander Ackermann	eba7ee156e	chore: bump collabora to collabora/code:25.04.4.2.1	2025-08-20 11:23:53 +02:00
Michael Flemming	3e25f30a59	Merge pull request #78 from opencloud-eu/fix_ldap_keycloak_password add ENV:LDAP_ADMIN_PASSWORD to keycloak container	2025-08-20 09:04:36 +02:00
Michael 'Flimmy' Flemming	95780abbb1	add ENV:LDAP_ADMIN_PASSWORD to keycloak container	2025-08-19 16:53:38 +02:00
Michael Barz	516632bc7c	Fix tika.yml folder name	2025-08-07 18:11:41 +02:00