From 7cc11081912e70de3cd5c9f124ff2064756c1583 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 30 Sep 2024 13:53:56 -0400 Subject: [PATCH 1/5] debug ci/cd - buildx error --- .github/workflows/keycloak-docker-cd.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/keycloak-docker-cd.yml b/.github/workflows/keycloak-docker-cd.yml index 37550d8..bdb806c 100644 --- a/.github/workflows/keycloak-docker-cd.yml +++ b/.github/workflows/keycloak-docker-cd.yml @@ -16,7 +16,9 @@ jobs: submodules: true - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 + with: + buildkitd-flags: --debug - name: Docker meta data id: docker-meta-data @@ -32,7 +34,7 @@ jobs: password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push Keycloak Docker image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64 From 82f54c4c7b610cc8654dc86af3052f11935fb8db Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 30 Sep 2024 14:08:38 -0400 Subject: [PATCH 2/5] retry health check no curl depend --- Dockerfile.keycloak | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile.keycloak b/Dockerfile.keycloak index d790ba8..8d33bd5 100644 --- a/Dockerfile.keycloak +++ b/Dockerfile.keycloak @@ -1,11 +1,4 @@ -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 && \ - rpm --root /mnt/rootfs -e --nodeps setup - - FROM keycloak/keycloak:22.0.1 COPY --from=ubi-micro-build /mnt/rootfs / -HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD curl --fail http://localhost:8080 || exit 1 +HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD "exec 3<>/dev/tcp/127.0.0.1/8080;echo -e \"GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n\" >&3;grep \"HTTP/1.1 200 OK\" <&3" COPY ./src/main/resources/ClientFhirServerRealm.json /opt/keycloak/data/import/ClientFhirServerRealm.json \ No newline at end of file From 1df98c545afc2595e520c3fe4a6db088aa663104 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 30 Sep 2024 14:10:18 -0400 Subject: [PATCH 3/5] remove curl from keycloak image debug --- Dockerfile.keycloak | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.keycloak b/Dockerfile.keycloak index 8d33bd5..83502ee 100644 --- a/Dockerfile.keycloak +++ b/Dockerfile.keycloak @@ -1,4 +1,3 @@ FROM keycloak/keycloak:22.0.1 -COPY --from=ubi-micro-build /mnt/rootfs / HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD "exec 3<>/dev/tcp/127.0.0.1/8080;echo -e \"GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n\" >&3;grep \"HTTP/1.1 200 OK\" <&3" COPY ./src/main/resources/ClientFhirServerRealm.json /opt/keycloak/data/import/ClientFhirServerRealm.json \ No newline at end of file From e1a41987d2b6187bdd70ea8136ea3364ed4435a0 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 30 Sep 2024 14:16:24 -0400 Subject: [PATCH 4/5] update workflow name for tagged image --- .github/workflows/keycloak-docker-tag-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/keycloak-docker-tag-cd.yml b/.github/workflows/keycloak-docker-tag-cd.yml index c2de2e6..3ffb503 100644 --- a/.github/workflows/keycloak-docker-tag-cd.yml +++ b/.github/workflows/keycloak-docker-tag-cd.yml @@ -1,4 +1,4 @@ -name: Docker Tagged Image CD +name: Keycloak Docker Tagged Image CD on: workflow_dispatch: push: From 415652df4af3011102d4ed5821ec70b87c953d68 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 30 Sep 2024 15:04:50 -0400 Subject: [PATCH 5/5] fix docker health check without curl --- Dockerfile.keycloak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.keycloak b/Dockerfile.keycloak index 83502ee..47e0a35 100644 --- a/Dockerfile.keycloak +++ b/Dockerfile.keycloak @@ -1,3 +1,3 @@ FROM keycloak/keycloak:22.0.1 -HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD "exec 3<>/dev/tcp/127.0.0.1/8080;echo -e \"GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n\" >&3;grep \"HTTP/1.1 200 OK\" <&3" +HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD bash -c 'echo -n > /dev/tcp/127.0.0.1/8080' COPY ./src/main/resources/ClientFhirServerRealm.json /opt/keycloak/data/import/ClientFhirServerRealm.json \ No newline at end of file