From 601f8b15c0b7a3a11800624cbeba94a4f15091e4 Mon Sep 17 00:00:00 2001
From: Allan Nava <allannava95@gmail.com>
Date: Tue, 23 Jan 2024 16:40:59 +0100
Subject: [PATCH] fiix docker

---
 .../workflows/docker-publish-kong2.6.0.yml    |  2 +-
 .../workflows/docker-publish-kong2.7.0 .yml   |  2 +-
 .../workflows/docker-publish-kong2.8.0.yml    |  2 +-
 .../workflows/docker-publish-kong3.4.0.yml    | 86 +++++++++++++++++++
 .../workflows/docker-publish-kong3.5.0.yml    |  2 +-
 Dockerfile.kong3.4.0                          | 24 ++++++
 Dockerfile.kong3.5.0                          |  4 +-
 7 files changed, 116 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/docker-publish-kong3.4.0.yml
 create mode 100644 Dockerfile.kong3.4.0

diff --git a/.github/workflows/docker-publish-kong2.6.0.yml b/.github/workflows/docker-publish-kong2.6.0.yml
index cc4b841..9d6073d 100644
--- a/.github/workflows/docker-publish-kong2.6.0.yml
+++ b/.github/workflows/docker-publish-kong2.6.0.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           REG=ghcr.io
           IMAGE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
-          DOCKER_IMAGE=${REG}/${IMAGE}-kong2.6.0
+          DOCKER_IMAGE=${REG}/${IMAGE}-2.6.0
           VERSION=nool
           if [ "${{ github.event_name }}" = "schedule" ]; then
             VERSION=nightly
diff --git a/.github/workflows/docker-publish-kong2.7.0 .yml b/.github/workflows/docker-publish-kong2.7.0 .yml
index a65f1a6..e85c856 100644
--- a/.github/workflows/docker-publish-kong2.7.0 .yml	
+++ b/.github/workflows/docker-publish-kong2.7.0 .yml	
@@ -24,7 +24,7 @@ jobs:
         run: |
           REG=ghcr.io
           IMAGE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
-          DOCKER_IMAGE=${REG}/${IMAGE}-kong2.7.0
+          DOCKER_IMAGE=${REG}/${IMAGE}-2.7.0
           VERSION=nool
           if [ "${{ github.event_name }}" = "schedule" ]; then
             VERSION=nightly
diff --git a/.github/workflows/docker-publish-kong2.8.0.yml b/.github/workflows/docker-publish-kong2.8.0.yml
index 1d57b66..7d9dbd4 100644
--- a/.github/workflows/docker-publish-kong2.8.0.yml
+++ b/.github/workflows/docker-publish-kong2.8.0.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           REG=ghcr.io
           IMAGE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
-          DOCKER_IMAGE=${REG}/${IMAGE}-kong2.8.0
+          DOCKER_IMAGE=${REG}/${IMAGE}-2.8.0
           VERSION=nool
           if [ "${{ github.event_name }}" = "schedule" ]; then
             VERSION=nightly
diff --git a/.github/workflows/docker-publish-kong3.4.0.yml b/.github/workflows/docker-publish-kong3.4.0.yml
new file mode 100644
index 0000000..4de154f
--- /dev/null
+++ b/.github/workflows/docker-publish-kong3.4.0.yml
@@ -0,0 +1,86 @@
+name: Docker publish kong3.4.0
+'on':
+  push:
+    tags:
+      - '*'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Repo metadata
+        id: repo
+        uses: actions/github-script@v4
+        with:
+          script: |
+            const repo = await github.repos.get(context.repo)
+            return repo.data
+      - name: Prepare
+        id: prep
+        run: |
+          REG=ghcr.io
+          IMAGE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
+          DOCKER_IMAGE=${REG}/${IMAGE}-3.4.0
+          VERSION=nool
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            VERSION=nightly
+          elif [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+            if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then
+              VERSION=latest
+            fi
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+            VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            MINOR=${VERSION%.*}
+            MAJOR=${MINOR%.*}
+            TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest"
+          fi
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: '${{ github.actor }}'
+          password: '${{ secrets.GITHUB_TOKEN }}'
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.kong3.5.0
+          platforms: linux/amd64
+          push: true
+          tags: '${{ steps.prep.outputs.tags }}'
+          labels: >
+            org.opencontainers.image.title=${{
+            fromJson(steps.repo.outputs.result).name }}
+
+            org.opencontainers.image.description=${{
+            fromJson(steps.repo.outputs.result).description }}
+
+            org.opencontainers.image.url=${{
+            fromJson(steps.repo.outputs.result).html_url }}
+
+            org.opencontainers.image.source=${{
+            fromJson(steps.repo.outputs.result).html_url }}
+
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+
+            org.opencontainers.image.revision=${{ github.sha }}
+
+            org.opencontainers.image.licenses=${{
+            fromJson(steps.repo.outputs.result).license.spdx_id }}
\ No newline at end of file
diff --git a/.github/workflows/docker-publish-kong3.5.0.yml b/.github/workflows/docker-publish-kong3.5.0.yml
index a461226..1f173c6 100644
--- a/.github/workflows/docker-publish-kong3.5.0.yml
+++ b/.github/workflows/docker-publish-kong3.5.0.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           REG=ghcr.io
           IMAGE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
-          DOCKER_IMAGE=${REG}/${IMAGE}-kong3.5.0
+          DOCKER_IMAGE=${REG}/${IMAGE}-3.5.0
           VERSION=nool
           if [ "${{ github.event_name }}" = "schedule" ]; then
             VERSION=nightly
diff --git a/Dockerfile.kong3.4.0 b/Dockerfile.kong3.4.0
new file mode 100644
index 0000000..0c4755f
--- /dev/null
+++ b/Dockerfile.kong3.4.0
@@ -0,0 +1,24 @@
+FROM kong/kong:3.4.0-alpine
+LABEL description="Kong 3.5.0 + kong-oidc plugin"
+ENV OIDC_PLUGIN_VERSION=1.1.0-0
+ENV JWT_PLUGIN_VERSION=1.1.0-1
+
+USER root
+RUN apk update && apk add git unzip luarocks
+RUN luarocks install kong-oidc
+
+RUN git clone https://github.com/PSheshenya/kong-oidc.git \
+    && cd kong-oidc \
+    && luarocks make
+
+RUN luarocks pack kong-oidc ${OIDC_PLUGIN_VERSION} \
+     && luarocks install kong-oidc-${OIDC_PLUGIN_VERSION}.all.rock
+
+RUN git clone --branch 20200505-access-token-processing https://github.com/BGaunitz/kong-plugin-jwt-keycloak.git \
+    && cd kong-plugin-jwt-keycloak \
+    && luarocks make
+
+RUN luarocks pack kong-plugin-jwt-keycloak ${JWT_PLUGIN_VERSION} \
+     && luarocks install kong-plugin-jwt-keycloak-${JWT_PLUGIN_VERSION}.all.rock
+
+USER kong
\ No newline at end of file
diff --git a/Dockerfile.kong3.5.0 b/Dockerfile.kong3.5.0
index 38da133..df9c9d2 100644
--- a/Dockerfile.kong3.5.0
+++ b/Dockerfile.kong3.5.0
@@ -1,5 +1,5 @@
-FROM kong/kong:3.5.0
-LABEL description="Kong 3.6.0 + kong-oidc plugin"
+FROM kong/kong:3.5.0-alpine
+LABEL description="Kong 3.5.0 + kong-oidc plugin"
 ENV OIDC_PLUGIN_VERSION=1.1.0-0
 ENV JWT_PLUGIN_VERSION=1.1.0-1