From 50fdf77b251a056290dcc4e33f79b3398609bc81 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:17:47 +0200 Subject: [PATCH 01/10] update to 21.0.2 --- Dockerfile | 4 ++-- rootfs/etc/s6-overlay/s6-rc.d/keycloak/run | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f080e9a..7942575 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/alpine:3.17 AS builder -ENV VERSION=20.0.3 -ENV SHA256_SUM=31ef88cdb58197a751788a58a9f6ad926dcaf0200a83b78105f33e90690e97cf +ENV VERSION=21.0.2 +ENV SHA256_SUM=bf14c65584630874194226ca43bdb484ddc9b0d6729955fa8addcf0b1b51654c RUN wget "https://github.com/keycloak/keycloak/releases/download/$VERSION/keycloak-$VERSION.tar.gz" RUN echo "$SHA256_SUM keycloak-$VERSION.tar.gz" | sha256sum -c - || exit 1 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index 6ec8d2a..a1ad11e 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -8,5 +8,6 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --db-password "$DB_PASSWORD" \ --hostname "$HOSTNAME" \ --http-enabled true \ - --hostname-strict-backchannel=true \ - --proxy edge + --hostname-strict-backchannel=true \ + --proxy edge \ + --metrics-enabled=true From 989183dbeb7b814834affabca3585bf566603b90 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:22:56 +0200 Subject: [PATCH 02/10] enable metrics --- rootfs/etc/s6-overlay/s6-rc.d/keycloak/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index a1ad11e..1a18433 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -10,4 +10,4 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --http-enabled true \ --hostname-strict-backchannel=true \ --proxy edge \ - --metrics-enabled=true + --metrics-enabled true From 5b628f8379ae0fae9e89aa3a3d7fa2fe280fd6d3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:25:18 +0200 Subject: [PATCH 03/10] enable metrics --- rootfs/etc/s6-overlay/s6-rc.d/keycloak/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index 1a18433..63438e2 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -1,6 +1,7 @@ #!/bin/sh exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ + --metrics-enabled true \ --optimized \ --db-url-host "$DB_HOST" \ --db-url-database "${DB_NAME:-keycloak}" \ @@ -9,5 +10,4 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --hostname "$HOSTNAME" \ --http-enabled true \ --hostname-strict-backchannel=true \ - --proxy edge \ - --metrics-enabled true + --proxy edge From b35171735f9c94097ec3d3c82e65124dc86a2a88 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:31:35 +0200 Subject: [PATCH 04/10] build with enabled metrics --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7942575..a4b64b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apk add --no-cache \ COPY --from=builder --chown=keycloak:keycloak /keycloak /home/keycloak/server -RUN /home/keycloak/server/bin/kc.sh build --db postgres +RUN /home/keycloak/server/bin/kc.sh build --db postgres --metrics-enabled true RUN chown -R keycloak:keycloak /home/keycloak ADD /rootfs / From af863edfa61bb3f38a24dfc8038fb41d75b91861 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:33:48 +0200 Subject: [PATCH 05/10] build with enabled metrics --- rootfs/etc/s6-overlay/s6-rc.d/keycloak/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index 63438e2..b95d5a2 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -1,7 +1,6 @@ #!/bin/sh exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ - --metrics-enabled true \ --optimized \ --db-url-host "$DB_HOST" \ --db-url-database "${DB_NAME:-keycloak}" \ @@ -9,5 +8,6 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --db-password "$DB_PASSWORD" \ --hostname "$HOSTNAME" \ --http-enabled true \ + --metrics-enabled true \ --hostname-strict-backchannel=true \ --proxy edge From e492e9777d41bbca1335da8e3542e4dff238b2a6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 8 Apr 2023 12:37:09 +0200 Subject: [PATCH 06/10] build with enabled metrics --- Dockerfile | 2 +- rootfs/etc/s6-overlay/s6-rc.d/keycloak/run | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4b64b3..8b3144a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apk add --no-cache \ COPY --from=builder --chown=keycloak:keycloak /keycloak /home/keycloak/server -RUN /home/keycloak/server/bin/kc.sh build --db postgres --metrics-enabled true +RUN /home/keycloak/server/bin/kc.sh build --db=postgres --metrics-enabled=true RUN chown -R keycloak:keycloak /home/keycloak ADD /rootfs / diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index b95d5a2..2b114f7 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -8,6 +8,5 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --db-password "$DB_PASSWORD" \ --hostname "$HOSTNAME" \ --http-enabled true \ - --metrics-enabled true \ --hostname-strict-backchannel=true \ --proxy edge From 7866ffc615613fe3d2b88c501f1576a371c79a24 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 16:29:01 +0200 Subject: [PATCH 07/10] push to 22.0.3 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b3144a..01b6762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM docker.io/alpine:3.17 AS builder +FROM docker.io/alpine:3.18 AS builder -ENV VERSION=21.0.2 -ENV SHA256_SUM=bf14c65584630874194226ca43bdb484ddc9b0d6729955fa8addcf0b1b51654c +ENV VERSION=22.0.3 +ENV SHA256_SUM=fe58029394c164042c5e50e59668eb6d0d9eaa564404522e07ac19f82b1a4d95 RUN wget "https://github.com/keycloak/keycloak/releases/download/$VERSION/keycloak-$VERSION.tar.gz" RUN echo "$SHA256_SUM keycloak-$VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir -p /keycloak RUN tar xvf keycloak-$VERSION.tar.gz -C /keycloak --strip 1 -FROM docker.io/thallian/alpine-s6:3.17 +FROM docker.io/thallian/alpine-s6:3.18-3.1.5.0 ENV JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" From ea303674e27dd9a0d4e4d1293f4b93da862aab53 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 15 Dec 2023 08:14:43 +0100 Subject: [PATCH 08/10] push to 32.0.2 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (76%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index db169b6..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/keycloak - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 76% rename from Dockerfile rename to Containerfile index 01b6762..b82a40f 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,14 +1,14 @@ -FROM docker.io/alpine:3.18 AS builder +FROM docker.io/alpine:3.19 AS builder -ENV VERSION=22.0.3 -ENV SHA256_SUM=fe58029394c164042c5e50e59668eb6d0d9eaa564404522e07ac19f82b1a4d95 +ENV VERSION=23.0.2 +ENV SHA256_SUM=4711535fb8846d34388ff79e01d83b3fd1b7701c0520bc8cb59739a6bfdab612 RUN wget "https://github.com/keycloak/keycloak/releases/download/$VERSION/keycloak-$VERSION.tar.gz" RUN echo "$SHA256_SUM keycloak-$VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir -p /keycloak RUN tar xvf keycloak-$VERSION.tar.gz -C /keycloak --strip 1 -FROM docker.io/thallian/alpine-s6:3.18-3.1.5.0 +FROM docker.io/thallian/alpine-s6:3.19-3.1.6.2 ENV JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" @@ -16,7 +16,7 @@ RUN addgroup -g 2222 keycloak RUN adduser -h /home/keycloak -u 2222 -D -G keycloak keycloak RUN apk add --no-cache \ - openjdk17-jre-headless \ + openjdk21-jre-headless \ bash COPY --from=builder --chown=keycloak:keycloak /keycloak /home/keycloak/server From ddb2e0f08f637119f81a5a7b966fd90ae8b8debf Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 12 Jan 2024 19:53:56 +0100 Subject: [PATCH 09/10] push to version 23.0.4 --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index b82a40f..ee34e55 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,7 @@ FROM docker.io/alpine:3.19 AS builder -ENV VERSION=23.0.2 -ENV SHA256_SUM=4711535fb8846d34388ff79e01d83b3fd1b7701c0520bc8cb59739a6bfdab612 +ENV VERSION=23.0.4 +ENV SHA256_SUM=102a4bee03fb38f0095e003b2590a24bd7a60485a751116a8688501ed630b219 RUN wget "https://github.com/keycloak/keycloak/releases/download/$VERSION/keycloak-$VERSION.tar.gz" RUN echo "$SHA256_SUM keycloak-$VERSION.tar.gz" | sha256sum -c - || exit 1 From 81f8710b59a6b41fb3142a0a6fd3785dde986252 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 13:40:04 +0100 Subject: [PATCH 10/10] push to 24.0.2 --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index ee34e55..e51e284 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,7 @@ FROM docker.io/alpine:3.19 AS builder -ENV VERSION=23.0.4 -ENV SHA256_SUM=102a4bee03fb38f0095e003b2590a24bd7a60485a751116a8688501ed630b219 +ENV VERSION=24.0.2 +ENV SHA256_SUM=8e8f196d8371e4c243b25e48149db242a483fabf2f0a628d31428ead95e52844 RUN wget "https://github.com/keycloak/keycloak/releases/download/$VERSION/keycloak-$VERSION.tar.gz" RUN echo "$SHA256_SUM keycloak-$VERSION.tar.gz" | sha256sum -c - || exit 1