Merge branch 'main' into develop

backend/pom.xml

@@ -28,6 +28,18 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <!-- temporarily pin Flyway version until Quarkus LTS contains Flyway >= 9.21.0; see https://github.com/cryptomator/hub/issues/256 -->
+        <groupId>org.flywaydb</groupId>
+        <artifactId>flyway-core</artifactId>
+        <version>9.22.3</version>
+      </dependency>
+      <dependency>
+        <!-- temporarily pin Flyway version until Quarkus LTS contains Flyway >= 9.21.0; see https://github.com/cryptomator/hub/issues/256 -->
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-flyway</artifactId>
+        <version>3.3.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

backend/src/main/resources/application.properties

@@ -33,7 +33,7 @@ hub.keycloak.oidc.cryptomator-client-id=cryptomator
 %dev.quarkus.keycloak.devservices.start-command=start-dev
 %dev.quarkus.keycloak.devservices.port=8180
 %dev.quarkus.keycloak.devservices.service-name=quarkus-cryptomator-hub
-%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:23.0.5
+%dev.quarkus.keycloak.devservices.image-name=ghcr.io/cryptomator/keycloak:23.0.6
 %dev.quarkus.oidc.devui.grant.type=code
 # OIDC will be mocked during unit tests. Use fake auth url to prevent dev services to start:
 %test.quarkus.oidc.auth-server-url=http://localhost:43210/dev/null

frontend/package.json

@@ -55,7 +55,7 @@
     "file-saver": "^2.0.5",
     "jdenticon": "^3.2.0",
     "jszip": "^3.10.1",
-    "keycloak-js": "^23.0.5",
+    "keycloak-js": "^23.0.6",
     "miscreant": "^0.3.2",
     "rfc4648": "^1.5.3",
     "semver": "^7.5.4",

keycloak/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:23.0.5 as builder
+FROM quay.io/keycloak/keycloak:23.0.6 as builder
 ENV KC_HEALTH_ENABLED=true
 ENV KC_METRICS_ENABLED=true
 ENV KC_HTTP_RELATIVE_PATH=/kc
@@ -11,10 +11,10 @@ FROM registry.access.redhat.com/ubi9 AS ubi-micro-build
 RUN mkdir -p /mnt/rootfs
 RUN dnf install --installroot /mnt/rootfs curl --releasever 9 --setopt install_weak_deps=false --nodocs -y; dnf --installroot /mnt/rootfs clean all
 
-FROM quay.io/keycloak/keycloak:23.0.5
+FROM quay.io/keycloak/keycloak:23.0.6
 LABEL maintainer="[email protected]"
 COPY --from=builder /opt/keycloak/ /opt/keycloak/
 COPY --from=ubi-micro-build /mnt/rootfs /
 COPY /themes/cryptomator /opt/keycloak/themes/cryptomator
 WORKDIR /opt/keycloak
-ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]
+ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]