diff --git a/bitnami/kong/3/debian-11/Dockerfile b/bitnami/kong/3/debian-11/Dockerfile index 0d3f35904b6e..399c52daddd8 100644 --- a/bitnami/kong/3/debian-11/Dockerfile +++ b/bitnami/kong/3/debian-11/Dockerfile @@ -7,13 +7,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-12-21T08:11:13Z" \ + org.opencontainers.image.created="2024-01-15T15:59:51Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.4.2-debian-11-r1" \ + org.opencontainers.image.ref.name="3.5.0-debian-11-r0" \ org.opencontainers.image.title="kong" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.4.2" + org.opencontainers.image.version="3.5.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,11 +23,12 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl libcrypt1 libgcc-s1 libprotobuf-dev libssl1.1 libyaml-0-2 perl procps zlib1g zlib1g-dev +RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libprotobuf-dev libssl1.1 perl procps zlib1g zlib1g-dev RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \ - "kong-3.4.2-1-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.3-2-linux-${OS_ARCH}-debian-11" \ + "kong-3.5.0-0-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -45,9 +46,9 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/kong/postunpack.sh -ENV APP_VERSION="3.4.2" \ +ENV APP_VERSION="3.5.0" \ BITNAMI_APP_NAME="kong" \ - PATH="/opt/bitnami/common/bin:/opt/bitnami/kong/bin:/opt/bitnami/kong/luarocks/bin:/opt/bitnami/kong/openresty/bin:/opt/bitnami/kong/openresty/luajit/bin:/opt/bitnami/kong/openresty/nginx/sbin:$PATH" + PATH="/opt/bitnami/common/bin:/opt/bitnami/nginx/sbin:/opt/bitnami/kong/bin:/opt/bitnami/kong/luarocks/bin:/opt/bitnami/kong/openresty/bin:/opt/bitnami/kong/openresty/luajit/bin:/opt/bitnami/kong/openresty/nginx/sbin:$PATH" EXPOSE 8000 8001 8443 8444 diff --git a/bitnami/kong/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kong/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7322e7867880..68fa3e477e0b 100644 --- a/bitnami/kong/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kong/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,18 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.4.2-1" + "version": "3.5.0-0" + }, + "nginx": { + "arch": "amd64", + "distro": "debian-11", + "type": "NAMI", + "version": "1.25.3-2" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-4" + "version": "1.0.6-5" } } \ No newline at end of file diff --git a/bitnami/kong/3/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kong/3/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/kong/3/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/kong/3/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/kong/3/debian-11/rootfs/opt/bitnami/scripts/kong/postunpack.sh b/bitnami/kong/3/debian-11/rootfs/opt/bitnami/scripts/kong/postunpack.sh index f645440763cf..3e8277460a5b 100755 --- a/bitnami/kong/3/debian-11/rootfs/opt/bitnami/scripts/kong/postunpack.sh +++ b/bitnami/kong/3/debian-11/rootfs/opt/bitnami/scripts/kong/postunpack.sh @@ -29,4 +29,3 @@ kong_conf_set nginx_daemon off kong_conf_set nginx_user "$KONG_DAEMON_USER" kong_configure_non_empty_values install_opentelemetry -configure_lua_paths "/opt/bitnami/scripts/kong-env.sh" "/etc/bash.bashrc" diff --git a/bitnami/kong/3/debian-11/tags-info.yaml b/bitnami/kong/3/debian-11/tags-info.yaml index 78624934f903..5f882132e06c 100644 --- a/bitnami/kong/3/debian-11/tags-info.yaml +++ b/bitnami/kong/3/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "3" - 3-debian-11 -- 3.4.2 +- 3.5.0 - latest diff --git a/bitnami/kong/README.md b/bitnami/kong/README.md index 0f9c9361c5c4..2874d19374de 100644 --- a/bitnami/kong/README.md +++ b/bitnami/kong/README.md @@ -93,18 +93,45 @@ We can launch another containers using the same flag (`--network NETWORK`) in th ## Configuration -The Bitnami Docker Kong can be easily setup with the following environment variables: +### Environment variables -* `KONG_PROXY_LISTEN_ADDRESS`: Address to which Kong Proxy service is bound to. Default: **0.0.0.0** -* `KONG_PROXY_HTTP_PORT_NUMBER`: The port Kong Proxy is listening for HTTP requests. Default: **8000** -* `KONG_PROXY_HTTPS_PORT_NUMBER`: The port Kong Proxy is listening for HTTPS requests. Default: **8443** -* `KONG_ADMIN_LISTEN_ADDRESS`: Address to which Kong Admin service is bound to. Default: **127.0.0.1** -* `KONG_ADMIN_HTTP_PORT_NUMBER`: The port Kong Admin is listening for HTTP requests. Default: **8001** -* `KONG_ADMIN_HTTPS_PORT_NUMBER`: The port Kong Admin is listening for HTTPS requests. Default: **8444** -* `KONG_MIGRATE`: Whether to automatically run Kong migration scripts on this node. In a cluster, only one node should have this flag enabled. Default: **no** -* `KONG_EXIT_AFTER_MIGRATE`: Whether to exit after performing the migration (it will not launch the Kong daemon). This is useful using the container in Jobs and Cron Jobs. Default: **no** +#### Customizable environment variables -This container also supports configuring Kong via environment values starting with `KONG_`. For instance, by setting the `KONG_LOG_LEVEL` environment variable, Kong will take into account this value rather than the property set in `kong.conf`. It is recommended to set the following environment variables: +| Name | Description | Default Value | +|---------------------------------|----------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------| +| `$KONG_MIGRATE` | Perform Kong database migration. | `no` | +| `$KONG_EXIT_AFTER_MIGRATE` | Exit Kong after performing the database migration. | `no` | +| `$KONG_PROXY_LISTEN_ADDRESS` | Listen address for Kong proxy daemon. | `0.0.0.0` | +| `$KONG_PROXY_HTTP_PORT_NUMBER` | HTTP port of the Kong proxy daemon. | `8000` | +| `$KONG_PROXY_HTTPS_PORT_NUMBER` | HTTPS port of the Kong proxy daemon. | `8443` | +| `$KONG_ADMIN_LISTEN_ADDRESS` | Listen address for Kong admin daemon. | `0.0.0.0` | +| `$KONG_ADMIN_HTTP_PORT_NUMBER` | HTTP port of the Kong admin daemon. | `8001` | +| `$KONG_ADMIN_HTTPS_PORT_NUMBER` | HTTPS port of the Kong admin daemon. | `8444` | +| `$KONG_NGINX_DAEMON` | Set silent log streams for the nginx daemon. | `off` | +| `$KONG_PROXY_LISTEN` | Kong proxy listen address. | `${KONG_PROXY_LISTEN_ADDRESS}:${KONG_PROXY_HTTP_PORT_NUMBER}, ${KONG_PROXY_LISTEN_ADDRESS}:${KONG_PROXY_HTTPS_PORT_NUMBER} ssl` | +| `$KONG_PROXY_LISTEN_OVERRIDE` | Override proxy listen. | `no` | +| `$KONG_ADMIN_LISTEN` | Kong admin listen address. | `${KONG_ADMIN_LISTEN_ADDRESS}:${KONG_ADMIN_HTTP_PORT_NUMBER}, ${KONG_ADMIN_LISTEN_ADDRESS}:${KONG_ADMIN_HTTPS_PORT_NUMBER} ssl` | +| `$KONG_ADMIN_LISTEN_OVERRIDE` | Override admin listen. | `no` | +| `$KONG_DATABASE` | Select database for Kong. | `postgres` | +| `$KONG_DATABASE` | Select database for Kong. | `postgres` | +| `$KONG_NGINX_USER` | Set nginx user. | `${KONG_DAEMON_USER} ${KONG_DAEMON_GROUP}` | + +#### Read-only environment variables + +| Name | Description | Value | +|---------------------------|-----------------------------------------------------|--------------------------------------| +| `$KONG_BASE_DIR` | Kong installation directory. | `${BITNAMI_ROOT_DIR}/kong` | +| `$KONG_CONF_DIR` | Kong configuration directory. | `${KONG_BASE_DIR}/conf` | +| `$KONG_CONF_FILE` | Kong configuration file. | `${KONG_CONF_DIR}/kong.conf` | +| `$KONG_DEFAULT_CONF_FILE` | Kong default configuration file. | `${KONG_CONF_DIR}/kong.conf.default` | +| `$KONG_INITSCRIPTS_DIR` | Kong directory for init scripts. | `/docker-entrypoint-initdb.d` | +| `$KONG_SERVER_DIR` | Directory where Kong Openresty instance is created. | `${KONG_BASE_DIR}/server` | +| `$KONG_LOGS_DIR` | Directory where Kong logs are stored. | `${KONG_SERVER_DIR}/logs` | +| `$KONG_PID_FILE` | Path to the PID file for Kong. | `${KONG_SERVER_DIR}/pids/nginx.pid` | +| `$KONG_DAEMON_USER` | Kong system user. | `kong` | +| `$KONG_DAEMON_GROUP` | Kong system group. | `kong` | + +Additionally, this container also supports configuring Kong via environment values starting with `KONG_`. For instance, by setting the `KONG_LOG_LEVEL` environment variable, Kong will take into account this value rather than the property set in `kong.conf`. It is recommended to set the following environment variables: * `KONG_DATABASE`: Database type used. Valid values: **postgres** or **off**. Default: **postgres** * For PostgreSQL database: `KONG_PG_HOST`, `KONG_PG_PORT`, `KONG_PG_TIMEOUT`, `KONG_PG_USER`, `KONG_PG_PASSWORD`.