From b09b5d4d1d202f1cc3493436d340f5ad4a8b69b8 Mon Sep 17 00:00:00 2001 From: Allan Nava Date: Tue, 23 Jan 2024 16:37:02 +0100 Subject: [PATCH] update docker kong --- Dockerfile.kong2.7.0 | 23 +++++++++-------------- Dockerfile.kong2.8.0 | 23 +++++++++-------------- Dockerfile.kong3.0.0 | 24 +++++++++--------------- Dockerfile.kong3.5.0 | 23 +++++++++-------------- 4 files changed, 36 insertions(+), 57 deletions(-) diff --git a/Dockerfile.kong2.7.0 b/Dockerfile.kong2.7.0 index 497f0bf..a03c50a 100644 --- a/Dockerfile.kong2.7.0 +++ b/Dockerfile.kong2.7.0 @@ -1,27 +1,22 @@ FROM kong/kong:2.7.0 - -ENV OIDC_PLUGIN_VERSION=1.2.3-2 +LABEL description="Kong 2.7.0 + kong-oidc plugin" +ENV OIDC_PLUGIN_VERSION=1.1.0-0 ENV JWT_PLUGIN_VERSION=1.1.0-1 -ENV GIT_VERSION=2.24.4-r0 -ENV UNZIP_VERSION=6.0-r7 -ENV LUAROCKS_VERSION=2.4.4-r1 - USER root -RUN apk update && apk add git=${GIT_VERSION} unzip=${UNZIP_VERSION} luarocks=${LUAROCKS_VERSION} +RUN apk update && apk add git unzip luarocks RUN luarocks install kong-oidc -RUN git clone --branch v1.2.3-2 https://github.com/revomatico/kong-oidc.git -WORKDIR /kong-oidc -RUN luarocks make +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 -WORKDIR / -RUN git clone --branch 20200505-access-token-processing https://github.com/BGaunitz/kong-plugin-jwt-keycloak.git -WORKDIR /kong-plugin-jwt-keycloak -RUN luarocks make +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 diff --git a/Dockerfile.kong2.8.0 b/Dockerfile.kong2.8.0 index 2589b96..cbb1f80 100644 --- a/Dockerfile.kong2.8.0 +++ b/Dockerfile.kong2.8.0 @@ -1,27 +1,22 @@ FROM kong/kong:2.8.0 - -ENV OIDC_PLUGIN_VERSION=1.2.3-2 +LABEL description="Kong 2.8.0 + kong-oidc plugin" +ENV OIDC_PLUGIN_VERSION=1.1.0-0 ENV JWT_PLUGIN_VERSION=1.1.0-1 -ENV GIT_VERSION=2.24.4-r0 -ENV UNZIP_VERSION=6.0-r7 -ENV LUAROCKS_VERSION=2.4.4-r1 - USER root -RUN apk update && apk add git=${GIT_VERSION} unzip=${UNZIP_VERSION} luarocks=${LUAROCKS_VERSION} +RUN apk update && apk add git unzip luarocks RUN luarocks install kong-oidc -RUN git clone --branch v1.2.3-2 https://github.com/revomatico/kong-oidc.git -WORKDIR /kong-oidc -RUN luarocks make +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 -WORKDIR / -RUN git clone --branch 20200505-access-token-processing https://github.com/BGaunitz/kong-plugin-jwt-keycloak.git -WORKDIR /kong-plugin-jwt-keycloak -RUN luarocks make +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 diff --git a/Dockerfile.kong3.0.0 b/Dockerfile.kong3.0.0 index 41b5c5f..275401a 100644 --- a/Dockerfile.kong3.0.0 +++ b/Dockerfile.kong3.0.0 @@ -1,29 +1,23 @@ FROM kong/kong:3.0.0 - -ENV OIDC_PLUGIN_VERSION=1.2.3-2 +LABEL description="Kong 3.0.0 + kong-oidc plugin" +ENV OIDC_PLUGIN_VERSION=1.1.0-0 ENV JWT_PLUGIN_VERSION=1.1.0-1 -ENV GIT_VERSION=2.24.4-r0 -ENV UNZIP_VERSION=6.0-r7 -ENV LUAROCKS_VERSION=2.4.4-r1 - USER root -RUN apk update && apk add git=${GIT_VERSION} unzip=${UNZIP_VERSION} luarocks=${LUAROCKS_VERSION} +RUN apk update && apk add git unzip luarocks RUN luarocks install kong-oidc -RUN git clone --branch v1.2.3-2 https://github.com/revomatico/kong-oidc.git -WORKDIR /kong-oidc -RUN luarocks make +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 -WORKDIR / -RUN git clone --branch 20200505-access-token-processing https://github.com/BGaunitz/kong-plugin-jwt-keycloak.git -WORKDIR /kong-plugin-jwt-keycloak -RUN luarocks make +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 484a224..38da133 100644 --- a/Dockerfile.kong3.5.0 +++ b/Dockerfile.kong3.5.0 @@ -1,27 +1,22 @@ FROM kong/kong:3.5.0 - -ENV OIDC_PLUGIN_VERSION=1.2.3-2 +LABEL description="Kong 3.6.0 + kong-oidc plugin" +ENV OIDC_PLUGIN_VERSION=1.1.0-0 ENV JWT_PLUGIN_VERSION=1.1.0-1 -ENV GIT_VERSION=2.24.4-r0 -ENV UNZIP_VERSION=6.0-r7 -ENV LUAROCKS_VERSION=2.4.4-r1 - USER root -RUN apk update && apk add git=${GIT_VERSION} unzip=${UNZIP_VERSION} luarocks=${LUAROCKS_VERSION} +RUN apk update && apk add git unzip luarocks RUN luarocks install kong-oidc -RUN git clone --branch v1.2.3-2 https://github.com/revomatico/kong-oidc.git -WORKDIR /kong-oidc -RUN luarocks make +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 -WORKDIR / -RUN git clone --branch 20200505-access-token-processing https://github.com/BGaunitz/kong-plugin-jwt-keycloak.git -WORKDIR /kong-plugin-jwt-keycloak -RUN luarocks make +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