diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 8731015..d651f13 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -1,9 +1,16 @@ +# Build repos that are not delpoyed (because these are feature branches) +FROM maven:3.9.4-eclipse-temurin-17 AS java +RUN git clone https://github.com/Aam-Digital/keycloak-2fa-email-authenticator.git email-auth +RUN cd email-auth && mvn package + # Inspired by https://www.keycloak.org/server/containers -FROM quay.io/keycloak/keycloak:19.0.1 as builder +FROM quay.io/keycloak/keycloak:22.0.5 AS builder ARG KC_DB=postgres -RUN curl -L https://github.com/aerogear/keycloak-metrics-spi/releases/download/3.0.0/keycloak-metrics-spi-3.0.0.jar > /opt/keycloak/providers/keycloak-metrics-spi.jar +ADD --chown=keycloak:keycloak https://github.com/aerogear/keycloak-metrics-spi/releases/download/3.0.0/keycloak-metrics-spi-3.0.0.jar /opt/keycloak/providers/keycloak-metrics-spi.jar +ADD --chown=keycloak:keycloak https://github.com/wouterh-dev/keycloak-spi-trusted-device/releases/download/v0.0.1-22/keycloak-spi-trusted-device-0.0.1-22.jar /opt/keycloak/providers/keycloak-trusted-device.jar +COPY --from=java email-auth/target/keycloak-2fa-email-authenticator-1.0.0.0-SNAPSHOT.jar /opt/keycloak/providers/keycloak-2fa-email-authenticator.jar RUN /opt/keycloak/bin/kc.sh build -FROM quay.io/keycloak/keycloak:19.0.1 +FROM quay.io/keycloak/keycloak:22.0.5 COPY --from=builder /opt/keycloak/lib/quarkus/ /opt/keycloak/lib/quarkus/ -COPY --from=builder /opt/keycloak/providers/keycloak-metrics-spi.jar /opt/keycloak/providers/ +COPY --from=builder /opt/keycloak/providers /opt/keycloak/providers/ diff --git a/keycloak/aam-theme/email/html/code-email.ftl b/keycloak/aam-theme/email/html/code-email.ftl new file mode 100644 index 0000000..aa75a53 --- /dev/null +++ b/keycloak/aam-theme/email/html/code-email.ftl @@ -0,0 +1,8 @@ + +
+If you have any problems or questions, don’t hesitate to get in touch with us at support@aam-digital.com.
-Best regards,
-Your Aam Digital Team
+${kcSanitize(msg("emailFooterHtml"))?no_esc}