Merge pull request #591 from Kong/release/3.0.0

release: 3.0.0

Dockerfile.apk

@@ -3,11 +3,11 @@ FROM alpine:3.16.0
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="ccda33bf02803b6b8dd46b22990f92265fe61d900ba94e3e0fa26db0433098c0"
-ARG KONG_ARM64_SHA="d21690332a89adf9900f7266e083f41f565eb009f2771ef112f3564878eeff53"
+ARG KONG_AMD64_SHA="b8e21beb32f803fae0959694ce7b6cec796a4159757e61b9cc0d30bed9682d10"
+ARG KONG_ARM64_SHA="4c5407c5ef2f0f29468e15ea4dc6a3f27011dbde3ce18170e4a4fd7e2bb2c03b"
 
 ARG ASSET=remote
 ARG EE_PORTS

Dockerfile.deb

@@ -3,10 +3,10 @@ FROM debian:bullseye-20220509-slim
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="a57852f49eb6aea6b672a99d1361457b208e8a2d63df3fa362b2d2d6ac979b4c"
+ARG KONG_SHA256="fa193923f0345a84af52497dc7d8a3d5d01416694cda415e2d69d901306d3fca"
 
 ARG ASSET=remote
 ARG EE_PORTS

Dockerfile.rpm

@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6@sha256:c7b45019f4db32e536e6
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
 # RedHat required labels
@@ -18,7 +18,7 @@ LABEL name="Kong" \
 # RedHat required LICENSE file approved path
 COPY LICENSE /licenses/
 
-ARG KONG_SHA256="8bae61982b8d439e12037e24432adc185f87113989c27c89521d8cc024b38ddc"
+ARG KONG_SHA256="c8b529f8e9dbcb2923b847f61c1039965426b141c96cb11c754dcf45e3088bdc"
 
 ARG ASSET=remote
 ARG EE_PORTS
@@ -28,7 +28,7 @@ COPY kong.rpm /tmp/kong.rpm
 # hadolint ignore=DL3015
 RUN set -ex; \
     if [ "$ASSET" = "remote" ] ; then \
-      DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-8/Packages/k/kong-$KONG_VERSION.rhel8.amd64.rpm" \
+      DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-8/Packages/k/kong-$KONG_VERSION.rhel8.6.amd64.rpm" \
       && curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \
       && echo "$KONG_SHA256  /tmp/kong.rpm" | sha256sum -c - \
       || exit 1; \

Makefile

@@ -1,6 +1,6 @@
 # DO NOT update KONG_BUILD_TOOLS manually - it's set by update.sh
 # to ensure same version is used here and in the respective kong version
-KONG_BUILD_TOOLS?=4.25.3
+KONG_BUILD_TOOLS?=4.33.19
 
 PACKAGE?=apk
 BASE?=alpine

alpine/Dockerfile

@@ -10,11 +10,11 @@ ARG EE_PORTS
 # hadolint ignore=DL3010
 COPY kong.tar.gz /tmp/kong.tar.gz
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="ccda33bf02803b6b8dd46b22990f92265fe61d900ba94e3e0fa26db0433098c0"
-ARG KONG_ARM64_SHA="d21690332a89adf9900f7266e083f41f565eb009f2771ef112f3564878eeff53"
+ARG KONG_AMD64_SHA="b8e21beb32f803fae0959694ce7b6cec796a4159757e61b9cc0d30bed9682d10"
+ARG KONG_ARM64_SHA="4c5407c5ef2f0f29468e15ea4dc6a3f27011dbde3ce18170e4a4fd7e2bb2c03b"
 
 # hadolint ignore=DL3018
 RUN set -eux; \

rhel/Dockerfile

@@ -2,10 +2,10 @@ FROM registry.access.redhat.com/ubi7/ubi:7.9@sha256:baccc7f4a9df7f4872116e254efb
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="4f2d073122c97be80de301e6037d0913f15de1d8bb6eea2871542e9a4c164c72"
+ARG KONG_SHA256="cc96b59c0ade4e6388487c5e8e1d132eb7de53fae963ddec93b143148c690cd3"
 
 # RedHat required labels
 LABEL name="Kong" \
@@ -28,7 +28,7 @@ COPY kong.rpm /tmp/kong.rpm
 
 RUN set -ex; \
     if [ "$ASSET" = "ce" ] ; then \
-      curl -fL "https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-7/Packages/k/kong-$KONG_VERSION.rhel7.amd64.rpm" -o /tmp/kong.rpm \
+      curl -fL "https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-7/Packages/k/kong-$KONG_VERSION.rhel7.9.amd64.rpm" -o /tmp/kong.rpm \
       && echo "$KONG_SHA256  /tmp/kong.rpm" | sha256sum -c - \
       || exit 1; \
     else \

tests/01-image.test.sh

@@ -133,8 +133,8 @@ function run_test {
 
   pushd kong-build-tools
   rm -rf test/tests/01-package
-  docker tag kong-$BASE $BASE:$BASE
-  KONG_VERSION=$version_given KONG_TEST_IMAGE_NAME=kong-$BASE RESTY_IMAGE_BASE=$BASE RESTY_IMAGE_TAG=$BASE make test
+  docker tag kong-$BASE kong/kong:amd64-test
+  KONG_TEST_CONTAINER_TAG=test KONG_VERSION=$version_given KONG_TEST_IMAGE_NAME=kong-$BASE RESTY_IMAGE_BASE=$BASE RESTY_IMAGE_TAG=$BASE make test
   if [ $? -eq 0 ]; then
     tsuccess
   else

ubuntu/Dockerfile

@@ -9,11 +9,11 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=2.8.1
+ARG KONG_VERSION=3.0.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="10d12d23e5890414d666663094d51a42de41f8a9806fbc0baaf9ac4d37794361"
-ARG KONG_ARM64_SHA="61c13219ef64dac9aeae5ae775411e8cfcd406f068cf3e75d463f916ae6513cb"
+ARG KONG_AMD64_SHA="3a38f6c4ba1cfc8897e655e46b957c7b0f2dd930111bf3d02411fedd1de53d6d"
+ARG KONG_ARM64_SHA="190f82dd47df19339c025f37701e62191aa3063e77e15c5e57d5b77869058f69"
 
 # hadolint ignore=DL3015
 RUN set -ex; \

update.sh

@@ -44,7 +44,8 @@ function get_url() {
 
 hub --version &> /dev/null || die "hub is not in PATH. Get it from https://github.com/github/hub"
 
-kbt_in_kong_v=$(curl -sL https://raw.githubusercontent.com/Kong/kong/$version/.requirements | grep 'KONG_BUILD_TOOLS_VERSION\=' | awk -F"=" '{print $2}' | tr -d "'[:space:]")
+#kbt_in_kong_v=$(curl -sL https://raw.githubusercontent.com/Kong/kong/$version/.requirements | grep 'KONG_BUILD_TOOLS_VERSION\=' | awk -F"=" '{print $2}' | tr -d "'[:space:]")
+kbt_in_kong_v=4.33.19
 if [[ -n "$kbt_in_kong_v" ]]; then
   sed -i.bak 's/KONG_BUILD_TOOLS?=.*/KONG_BUILD_TOOLS?='$kbt_in_kong_v'/g' Makefile
 fi
@@ -74,7 +75,7 @@ pushd alpine
 popd
 
 pushd rhel
-   url=$(get_url Dockerfile amd64 "RHEL_VERSION=7")
+   url=$(get_url Dockerfile amd64 "RHEL_VERSION=7.9")
    echo $url
    curl -fL $url -o /tmp/kong
    new_sha=$(sha256sum /tmp/kong | cut -b1-64)