Merge pull request #669 from Kong/manual_release_2.8.4

release(2.8.4): release 2.8.4

Dockerfile.apk

@@ -1,10 +1,10 @@
-FROM alpine:3.15
+FROM alpine:3.18
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="46e8ccd60fdcfb44a02b7ff9cfc79b701bf1275ec6ba88138d98317509c682fa"
-ARG KONG_ARM64_SHA="f6c90eb9b126e049859f037e81f070f4116ac701c4e4b9ad2d1ec574fbe44bb3"
+ARG KONG_AMD64_SHA="930b3b933b6c3f0393700433a919745900485d19e0cd8aba2d70aa066ccd10d2"
+ARG KONG_ARM64_SHA="9027da2a4df477b462f34da9450412012ffdc0f9019e33ed7ff8e88f3df062c6"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
@@ -18,8 +18,8 @@ RUN set -ex; \
     arch="$(apk --print-arch)"; \
     major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     case "${arch}" in \
-      x86_64) export ARCH='amd64'; KONG_SHA256=$KONG_AMD64_SHA ;; \
-      aarch64) export ARCH='arm64'; KONG_SHA256=$KONG_ARM64_SHA ;; \
+      x86_64) KONG_SHA256=$KONG_AMD64_SHA ;; \
+      aarch64) KONG_SHA256=$KONG_ARM64_SHA ;; \
     esac; \
     apk add bash curl ca-certificates; \
     if [ "$ASSET" = "remote" ] ; then \
@@ -53,6 +53,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong-health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

Dockerfile.deb

@@ -1,9 +1,9 @@
 FROM debian:bullseye-slim
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="5f1298c36791456f6ef67420a4aca391c90ba9051f38caa0d9cfac3c6424d839"
+ARG KONG_SHA256="28f7f215a097612f35d3ae86d35c3fbb24a1454a7529f500e2341d5764a5d8a5"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
@@ -17,35 +17,25 @@ RUN set -ex; \
     arch="$(dpkg --print-architecture)"; \
     major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     apt-get update; \
-    apt-get install -y curl zstd xz-utils binutils; \
+    apt-get install -y curl; \
     if [ "$ASSET" = "remote" ] ; then \
-      CODENAME=$(grep VERSION_CODENAME /etc/os-release | cut -d'=' -f2) \
-      && DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${major_minor}/deb/debian/pool/${CODENAME}/main/k/ko/kong_${KONG_VERSION}/kong_${KONG_VERSION}_$arch.deb" \
-      && curl -fL "$DOWNLOAD_URL" -o /tmp/kong.deb \
+      CODENAME=$(grep -m1 VERSION_CODENAME /etc/os-release | cut -d = -f 2); \
+      DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${major_minor}/deb/debian/pool/${CODENAME}/main/k/ko/kong_${KONG_VERSION}/kong_${KONG_VERSION}_${arch}.deb"; \
+      curl -fL "$DOWNLOAD_URL" -o /tmp/kong.deb \
       && echo "${KONG_SHA256}  /tmp/kong.deb" | sha256sum -c -; \
     fi \
-    && if grep -E -qs 'buster|bullseye|xenial|bionic' /etc/os-release ; then \
-      echo "older deb systems don't support zstd compression"; \
-      echo "repack using xz compression instead" \
-      && ar -x /tmp/kong.deb \
-      && zstd -d < control.tar.zst | xz > control.tar.xz \
-      && zstd -d < data.tar.zst | xz > data.tar.xz \
-      && ar -m -c -a sdsd /tmp/kong-repack.deb debian-binary control.tar.xz data.tar.xz \
-      && rm debian-binary control.* data.* \
-      && apt-get install --yes /tmp/kong-repack.deb; \
-    else \
-      apt-get install --yes /tmp/kong.deb; \
-    fi \
+    && apt-get update \
+    && apt-get install --yes /tmp/kong.deb \
     && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /tmp/*.deb \
+    && rm -rf /tmp/kong.deb \
     && chown kong:0 /usr/local/bin/kong \
     && chown -R kong:0 ${KONG_PREFIX} \
     && ln -s /usr/local/openresty/bin/resty /usr/local/bin/resty \
     && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/luajit \
     && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/lua \
     && ln -s /usr/local/openresty/nginx/sbin/nginx /usr/local/bin/nginx \
     && kong version \
-    && apt-get purge curl zstd xz-utils binutils -y
+    && apt-get purge curl -y
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
@@ -57,6 +47,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong-health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

Dockerfile.rpm

@@ -1,9 +1,9 @@
 FROM redhat/ubi8
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="1f67d6c35a359608505b7a65f4bd9f5b459d28a8bc2ca1c70f101fe78c331139"
+ARG KONG_SHA256="5d3e2712dd4d6b2b3adbe9bafdadd1f15f1f9c89256f9c24d339e4f44f9cc94d"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
@@ -18,15 +18,14 @@ RUN set -ex; \
     arch='x86_64'; \
     major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     if [ "$ASSET" = "remote" ] ; then \
-      VERSION=$(grep '^VERSION_ID' /etc/os-release | cut -d = -f 2 | sed -e 's/^"//' -e 's/"$//' | cut -d . -f 1) \
-      && DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${major_minor}/rpm/el/8/${arch}/kong-${KONG_VERSION}-1.${arch}.rpm" \
-      && curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \
-      && echo "$KONG_SHA256  /tmp/kong.rpm" | sha256sum -c -; \
+      DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${major_minor}/rpm/el/8/${arch}/kong-${KONG_VERSION}.el8.${arch}.rpm"; \
+      curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \
+      && echo "${KONG_SHA256}  /tmp/kong.rpm" | sha256sum -c -; \
     fi \
     && yum install -y /tmp/kong.rpm \
     && rm /tmp/kong.rpm \
     && chown kong:0 /usr/local/bin/kong \
-    && chown -R kong:0 ${KONG_PREFIX} \
+    && chown -R kong:0 "$KONG_PREFIX" \
     && ln -s /usr/local/openresty/bin/resty /usr/local/bin/resty \
     && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/luajit \
     && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/lua \
@@ -43,6 +42,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong-health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 LABEL maintainer="Kong <support@konghq.com>"
 
@@ -10,29 +10,30 @@ ARG EE_PORTS
 # hadolint ignore=DL3010
 COPY kong.tar.gz /tmp/kong.tar.gz
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="46e8ccd60fdcfb44a02b7ff9cfc79b701bf1275ec6ba88138d98317509c682fa"
-ARG KONG_ARM64_SHA="f6c90eb9b126e049859f037e81f070f4116ac701c4e4b9ad2d1ec574fbe44bb3"
+ARG KONG_AMD64_SHA="930b3b933b6c3f0393700433a919745900485d19e0cd8aba2d70aa066ccd10d2"
+ARG KONG_ARM64_SHA="9027da2a4df477b462f34da9450412012ffdc0f9019e33ed7ff8e88f3df062c6"
 
 # hadolint ignore=DL3018
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
+    major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     case "${arch}" in \
-      x86_64) arch='amd64'; KONG_SHA256=$KONG_AMD64_SHA ;; \
-      aarch64) arch='arm64'; KONG_SHA256=$KONG_ARM64_SHA ;; \
+      x86_64) KONG_SHA256=$KONG_AMD64_SHA ;; \
+      aarch64) KONG_SHA256=$KONG_ARM64_SHA ;; \
     esac; \
     if [ "$ASSET" = "ce" ] ; then \
       apk add --no-cache --virtual .build-deps curl wget tar ca-certificates \
-      && curl -fL "https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-alpine/kong-$KONG_VERSION.$arch.apk.tar.gz" -o /tmp/kong.tar.gz \
+      && curl -fL "https://packages.konghq.com/public/gateway-${major_minor}/raw/names/kong-${arch}/versions/${KONG_VERSION}/kong-${KONG_VERSION}.${arch}.apk.tar.gz" -o /tmp/kong.tar.gz \
       && echo "$KONG_SHA256  /tmp/kong.tar.gz" | sha256sum -c - \
       && apk del .build-deps; \
     else \
       # this needs to stay inside this "else" block so that it does not become part of the "official images" builds (https://github.com/docker-library/official-images/pull/11532#issuecomment-996219700)
       apk upgrade; \
-    fi; \
-    mkdir /kong \
+    fi \
+    && mkdir /kong \
     && tar -C /kong -xzf /tmp/kong.tar.gz \
     && mv /kong/usr/local/* /usr/local \
     && mv /kong/etc/* /etc \
@@ -63,6 +64,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=10s --timeout=10s --retries=10 CMD kong health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

centos/Dockerfile

@@ -52,6 +52,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=10s --timeout=10s --retries=10 CMD kong health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

customize/Dockerfile

@@ -51,6 +51,6 @@ RUN true
 #COPY --from=build /usr/local/bin /usr/local/bin
 
 
-HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong-health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 USER kong

rhel/Dockerfile

@@ -4,10 +4,10 @@ FROM registry.access.redhat.com/ubi${RHEL_VERSION}/ubi
 
 MAINTAINER Kong
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="ca4e0f5a91a8bd1f5dc82cc9ac0583f2a83c07f23c1a0e7a4788d15a9e23a1c7"
+ARG KONG_SHA256="cad72db4b24884800043758821408cfb594f89936d5ec03908da7bc01680cc66"
 
 LABEL name="Kong" \
       vendor="Kong" \
@@ -30,14 +30,16 @@ ARG RHEL_VERSION
 ENV RHEL_VERSION $RHEL_VERSION
 
 RUN set -ex; \
+    arch='x86_64'; \
+    major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     if [ "$ASSET" = "ce" ] ; then \
-      curl -fL "https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-$RHEL_VERSION/Packages/k/kong-$KONG_VERSION.rhel${RHEL_VERSION}.amd64.rpm" -o /tmp/kong.rpm \
+      curl -fL "https://packages.konghq.com/public/gateway-${major_minor}/rpm/el/${RHEL_VERSION}/${arch}/kong-${KONG_VERSION}.el${RHEL_VERSION}.${arch}.rpm" -o /tmp/kong.rpm \
       && echo "$KONG_SHA256  /tmp/kong.rpm" | sha256sum -c -; \
     else \
       yum update -y \
       && yum upgrade -y ; \
-    fi; \
-    yum install -y -q unzip shadow-utils \
+    fi \
+    && yum install -y -q unzip shadow-utils \
     && yum clean all -q \
     && rm -fr /var/cache/yum/* /tmp/yum_save*.yumtx /root/.pki \
     # Please update the rhel install docs if the below line is changed so that
@@ -66,6 +68,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=10s --timeout=10s --retries=10 CMD kong health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]

ubuntu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
 ARG ASSET=ce
 ENV ASSET $ASSET
@@ -7,31 +7,32 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=2.8.3
+ARG KONG_VERSION=2.8.4
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="b52baf1caa300c3ee70ff4d58982085b1da9203c69118c885f00d13954634810"
-ARG KONG_ARM64_SHA="1d5c2064d44b76fbb3cabf168dc226e91fedb991ace32915297505d089679fed"
+ARG KONG_AMD64_SHA="e4bc62c80f717114cc486776ee453931c5de0e8eaf0901ac11dbb4b2bae14534"
+ARG KONG_ARM64_SHA="4fff44f9a0c7b06469591b7d1499a99a100109bc3f08dc412dd0eb38ff383d35"
 
 # hadolint ignore=DL3015
 RUN set -ex; \
     arch=$(dpkg --print-architecture); \
+    major_minor="$(echo "${KONG_VERSION%.*}" | tr -d '.')"; \
     case "${arch}" in \
       amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \
       arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \
     esac; \
     apt-get update \
     && if [ "$ASSET" = "ce" ] ; then \
+      CODENAME=$(grep -m1 VERSION_CODENAME /etc/os-release | cut -d = -f 2); \
       apt-get install -y curl \
-      && UBUNTU_CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) \
-      && curl -fL https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-ubuntu-${UBUNTU_CODENAME}/pool/all/k/kong/kong_${KONG_VERSION}_$arch.deb -o /tmp/kong.deb \
+      && curl -fL "https://packages.konghq.com/public/gateway-${major_minor}/deb/ubuntu/pool/${CODENAME}/main/k/ko/kong_${KONG_VERSION}/kong_${KONG_VERSION}_${arch}.deb" -o /tmp/kong.deb \
       && apt-get purge -y curl \
       && echo "$KONG_SHA256  /tmp/kong.deb" | sha256sum -c -; \
     else \
       # this needs to stay inside this "else" block so that it does not become part of the "official images" builds (https://github.com/docker-library/official-images/pull/11532#issuecomment-996219700)
       apt-get upgrade -y ; \
-    fi; \
-    apt-get install -y --no-install-recommends unzip git \
+    fi \
+    && apt-get install -y --no-install-recommends unzip git \
     # Please update the ubuntu install docs if the below line is changed so that
     # end users can properly install Kong along with its required dependencies
     # and that our CI does not diverge from our docs.
@@ -58,6 +59,6 @@ EXPOSE 8000 8443 8001 8444 $EE_PORTS
 
 STOPSIGNAL SIGQUIT
 
-HEALTHCHECK --interval=10s --timeout=10s --retries=10 CMD kong health
+HEALTHCHECK --interval=60s --timeout=10s --retries=10 CMD kong health
 
 CMD ["kong", "docker-start"]