Skip to content
This repository has been archived by the owner on Dec 24, 2023. It is now read-only.

Commit

Permalink
Bump kong to 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristian Chiru committed Jun 13, 2023
1 parent 29f78c5 commit fbb0463
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM kong/kong:3.2.2-alpine
FROM kong/kong:3.3.0-alpine

USER root

Expand Down Expand Up @@ -38,7 +38,7 @@ RUN set -ex \
&& TPL=${LUA_BASE_DIR}/kong/templates/nginx_kong.lua \
# May cause side effects when using another nginx under this kong, unless set to the same value
&& sed -i '/server_name kong;/a\ \n\
set_decode_base64 \$session_secret "\${{X_SESSION_SECRET}}";\n\
set \$session_secret "\${{X_SESSION_SECRET}}";\n\
' "$TPL" \
# Patch nginx_kong.lua to set dictionaries
&& sed -i -E '/^lua_shared_dict kong\s+.+$/i\ \n\
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
## Notes

- Overriding numeric values like ports via env vars: due to a limitation in the lua templating engine in openresty, they must be quoted twice: `KONG_X_VAR="'1234'"`.
- Dockerfile will patch `nginx_kong.lua` template at build time, to include `set_decode_base64 $session_secret "$KONG_X_SESSION_SECRET";`
- Dockerfile will patch `nginx_kong.lua` template at build time, to include `set $session_secret "$KONG_X_SESSION_SECRET";`
- This is needed for the kong-oidc plugin to set a session secret that will later override the template string
- See: <https://github.com/nokia/kong-oidc/issues/1>
- A common default session_secret must be defined by setting env `KONG_X_SESSION_SECRET` to a base64 encoded string to avoid Kong 500 server error: set_decode_base64: invalid value
- A common default session_secret must be defined by setting env `KONG_X_SESSION_SECRET` to a string
- To enable the plugins, set the env variable for the container with comma separated plugin values:
- `KONG_PLUGINS=bundled,oidc`
- Default: `KONG_X_SESSION_NAME=oidc_session`
Expand Down Expand Up @@ -89,7 +89,8 @@
## Releases
- Kong v3.2.2: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/master/Dockerfile)
- Kong v3.3.0: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/master/Dockerfile)
- Kong v3.2.2: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/3.2.2-4/Dockerfile)
- Kong v3.2.1: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/3.2.1-2/Dockerfile)
- Kong v3.1.1: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/3.1.1-1/Dockerfile)
- Kong v3.1.0: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/3.1.0-1/Dockerfile)
Expand All @@ -116,6 +117,8 @@
- Kong v2.0.2: [Dockerfile](https://github.com/revomatico/docker-kong-oidc/blob/2.0.2-1/Dockerfile)
## Release notes
- 2023-06-13 [3.3.0-1]
- Bump kong to 3.3.0
- 2023-03-26 [3.2.2-4]
- Introduce `KONG_X_NOLOG_LIST_FILE` that could optionally point to a file containing list of IPs to be excluded from access_log
- 2023-03-26 [3.2.2-3]
Expand Down
2 changes: 1 addition & 1 deletion common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Common script used by all others to define variables and stay DRY
DOCKER_CONTAINER='docker-kong-oidc'
DOCKER_IMAGE="local/$DOCKER_CONTAINER:3.2.2-4"
DOCKER_IMAGE="local/$DOCKER_CONTAINER:3.3.0-1"
KONG_LOCAL_HTTP_PORT=${KONG_LOCAL_HTTP_PORT:-18000}
KONG_LOCAL_HTTPS_PORT=${KONG_LOCAL_HTTPS_PORT:-14443}
KONG_LOCAL_ADMIN_PORT=${KONG_LOCAL_ADMIN_PORT:-18001}

0 comments on commit fbb0463

Please sign in to comment.