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 68% rename from Dockerfile rename to Containerfile index f080e9a..e51e284 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,14 +1,14 @@ -FROM docker.io/alpine:3.17 AS builder +FROM docker.io/alpine:3.19 AS builder -ENV VERSION=20.0.3 -ENV SHA256_SUM=31ef88cdb58197a751788a58a9f6ad926dcaf0200a83b78105f33e90690e97cf +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 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.19-3.1.6.2 ENV JAVA_OPTS_APPEND="-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true" @@ -16,12 +16,12 @@ 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 -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 / diff --git a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run index 6ec8d2a..2b114f7 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/keycloak/run @@ -8,5 +8,5 @@ exec s6-setuidgid keycloak /home/keycloak/server/bin/kc.sh start \ --db-password "$DB_PASSWORD" \ --hostname "$HOSTNAME" \ --http-enabled true \ - --hostname-strict-backchannel=true \ + --hostname-strict-backchannel=true \ --proxy edge