From 53ce46daa0c99cb9a0dc8eceb4e228bcba779e1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:27:48 +0000 Subject: [PATCH 1/3] feat: bump keycloak/keycloak from 20.0.3-0 to 21.0.0-0 Bumps keycloak/keycloak from 20.0.3-0 to 21.0.0-0. --- updated-dependencies: - dependency-name: keycloak/keycloak dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 745b888..c7e6760 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/keycloak/keycloak:20.0.3-0 as builder +FROM quay.io/keycloak/keycloak:21.0.0-0 as builder # Theme version, see https://github.com/radiorabe/keycloak-theme-rabe/releases ARG THEME_VERSION=0.3.0 From df3a55edd7a4e28cf5c55ab076011148bc61e3b2 Mon Sep 17 00:00:00 2001 From: Lucas Bickel <116588+hairmare@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:37:57 +0100 Subject: [PATCH 2/3] chore: external builder --- Dockerfile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7e6760..f70cdd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,15 @@ -FROM quay.io/keycloak/keycloak:21.0.0-0 as builder - # Theme version, see https://github.com/radiorabe/keycloak-theme-rabe/releases ARG THEME_VERSION=0.3.0 + +FROM ghcr.io/radiorabe/ubi9-minimal:0.2.2 as downloader + +RUN curl -L -o /keycloak-theme-rabe-$THEME_VERSION.jar \ + https://github.com/radiorabe/keycloak-theme-rabe/releases/download/v$THEME_VERSION/keycloak-theme-rabe.jar + + +FROM quay.io/keycloak/keycloak:21.0.0-0 as builder + # Enable health and metrics support ENV KC_HEALTH_ENABLED=true ENV KC_METRICS_ENABLED=true @@ -12,16 +19,8 @@ ENV KC_DB=postgres WORKDIR /opt/keycloak -# install curl so we can download our theme -USER 0 -RUN microdnf install -y \ - curl \ - && microdnf clean all -USER 1000 - -RUN curl -L -o providers/keycloak-theme-rabe-$THEME_VERSION.jar \ - https://github.com/radiorabe/keycloak-theme-rabe/releases/download/v$THEME_VERSION/keycloak-theme-rabe.jar \ - && /opt/keycloak/bin/kc.sh build +COPY --from=downloader /keycloak-theme-rabe-$THEME_VERSION.jar /opt/keycloak/providers/ +RUN /opt/keycloak/bin/kc.sh build FROM ghcr.io/radiorabe/ubi9-minimal:0.2.2 From db404bb5ccaec5dce1f733fe3bb75b3e83efc357 Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 24 Feb 2023 15:42:39 +0100 Subject: [PATCH 3/3] chore: remove version from jarname --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f70cdd3..534d172 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ +FROM ghcr.io/radiorabe/ubi9-minimal:0.2.2 as downloader + # Theme version, see https://github.com/radiorabe/keycloak-theme-rabe/releases ARG THEME_VERSION=0.3.0 - -FROM ghcr.io/radiorabe/ubi9-minimal:0.2.2 as downloader - -RUN curl -L -o /keycloak-theme-rabe-$THEME_VERSION.jar \ +RUN curl -L -o /keycloak-theme-rabe.jar \ https://github.com/radiorabe/keycloak-theme-rabe/releases/download/v$THEME_VERSION/keycloak-theme-rabe.jar @@ -19,7 +18,7 @@ ENV KC_DB=postgres WORKDIR /opt/keycloak -COPY --from=downloader /keycloak-theme-rabe-$THEME_VERSION.jar /opt/keycloak/providers/ +COPY --from=downloader /keycloak-theme-rabe.jar /opt/keycloak/providers/ RUN /opt/keycloak/bin/kc.sh build