chore(*) bump to Kong 2.5.0

kates · Jul 13, 2021 · c7710e8 · c7710e8
1 parent 23ce5e4
commit c7710e8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-KONG_BUILD_TOOLS?=4.18.1
+KONG_BUILD_TOOLS?=4.20.0
 BASE?=centos
 
 build:

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -9,14 +9,14 @@ ARG EE_PORTS
 
 COPY kong.tar.gz /tmp/kong.tar.gz
 
-ARG KONG_VERSION=2.4.1
+ARG KONG_VERSION=2.5.0
 ENV KONG_VERSION $KONG_VERSION
 
 
-ARG KONG_AMD64_SHA="582cbcf23eb4dcdf9873105ac7d8428a4022ec61bcc68642ad9dd8a5c03e2a57"
+ARG KONG_AMD64_SHA="c63356c42b69388a849b592944d9f233769ad5fe6a333349b66ff8a4702f9af0"
 ENV KONG_AMD64_SHA $KONG_AMD64_SHA
 
-ARG KONG_ARM64_SHA="5ec35d1b19dd4e6592ad2c6586e68bfd1549c6a22840ce7d5654677b94e5028a"
+ARG KONG_ARM64_SHA="c86ab7c7f136abebbe5891c9ffafbf51ba23566f8db68837a9535cb55c87d757"
 ENV KONG_ARM64_SHA $KONG_ARM64_SHA
 
 RUN set -eux; \

diff --git a/centos/Dockerfile b/centos/Dockerfile
@@ -8,10 +8,10 @@ ARG EE_PORTS
 
 COPY kong.rpm /tmp/kong.rpm
 
-ARG KONG_VERSION=2.4.1
+ARG KONG_VERSION=2.5.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="b8083a6c268f69865e66a8d504fcdacab49ba36a4194ccfc9737d65e6863c30a"
+ARG KONG_SHA256="d3ced5f12e55d4d88b60bb5e8533c20b84bd390be0dbf253b46e47472c2287c5"
 
 RUN set -ex; \
     if [ "$ASSET" = "ce" ] ; then \

diff --git a/rhel/Dockerfile b/rhel/Dockerfile
@@ -21,13 +21,13 @@ ARG EE_PORTS
 
 COPY kong.rpm /tmp/kong.rpm
 
-ARG KONG_VERSION=2.4.1
+ARG KONG_VERSION=2.5.0
 ENV KONG_VERSION $KONG_VERSION
 
 ARG RHEL_VERSION
 ENV RHEL_VERSION $RHEL_VERSION
 
-ARG KONG_SHA256="2c7450d99b878f215677bb20ce4e15f1b385544fbf7cb4ffc061af983a9d9172"
+ARG KONG_SHA256="f2a781caa4fe3e87d8bcde97e151ca5202fcc79a48a0a073cdc371731c243a46"
 ENV KONG_SHA256 $KONG_SHA256
 
 RUN set -ex; \

diff --git a/submit/official-images b/submit/official-images
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
@@ -7,7 +7,7 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=2.4.1
+ARG KONG_VERSION=2.5.0
 ENV KONG_VERSION $KONG_VERSION
 
 RUN set -ex \

diff --git a/update.sh b/update.sh
@@ -34,7 +34,7 @@ function get_url() {
 
   eval $args
 
-  raw_url=$(grep download.konghq.com $dockerfile | awk -F" " '{print $3}' | sed 's/\"//g')
+  raw_url=$(egrep -o 'https?://download.konghq.com/gateway-[^ ]+' $dockerfile | sed 's/\"//g')
 
   # set variables contained in raw url
   KONG_VERSION=$version
@@ -51,13 +51,15 @@ fi
 
 pushd alpine
    url=$(get_url Dockerfile amd64)
+   echo $url
    curl -fL $url -o /tmp/kong
    new_sha=$(sha256sum /tmp/kong | cut -b1-64)
 
    sed -i.bak 's/ARG KONG_AMD64_SHA=.*/ARG KONG_AMD64_SHA=\"'$new_sha'\"/g' Dockerfile
    sed -i.bak 's/ARG KONG_VERSION=.*/ARG KONG_VERSION='$version'/g' Dockerfile
 
    url=$(get_url Dockerfile arm64)
+   echo $url
    curl -fL $url -o /tmp/kong
    new_sha=$(sha256sum /tmp/kong | cut -b1-64)
 
@@ -67,6 +69,7 @@ popd
 
 pushd centos
    url=$(get_url Dockerfile amd64)
+   echo $url
    curl -fL $url -o /tmp/kong
    new_sha=$(sha256sum /tmp/kong | cut -b1-64)
 
@@ -76,6 +79,7 @@ popd
 
 pushd rhel
    url=$(get_url Dockerfile amd64 "RHEL_VERSION=7")
+   echo $url
    curl -fL $url -o /tmp/kong
    new_sha=$(sha256sum /tmp/kong | cut -b1-64)