Merge pull request #545 from Kong/release/2.8.0-sans-centos

Release Kong 2.8.0 and remove CentOS
Kong · Mar 1, 2022 · c32a80c · c32a80c
2 parents d47ddd4 + 9e478af
commit c32a80c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 154 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        image: [alpine, centos, ubuntu, rhel]
+        image: [alpine, ubuntu, rhel]
 
     env:
       BASE: ${{ matrix.image }}

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-KONG_BUILD_TOOLS?=4.23.0
-BASE?=centos
+KONG_BUILD_TOOLS?=4.25.3
+BASE?=alpine
 
 build:
 	docker build --no-cache -t kong-$(BASE) $(BASE)/

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -10,11 +10,11 @@ ARG EE_PORTS
 # hadolint ignore=DL3010
 COPY kong.tar.gz /tmp/kong.tar.gz
 
-ARG KONG_VERSION=2.7.1
+ARG KONG_VERSION=2.8.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="7ccd12a15f357dea4d9bea2a5c06c1efe05dcaa0bc8b937f00619e31634715c4"
-ARG KONG_ARM64_SHA="00f6c3af15418af07d7429e15762db2355a5f9cdbf278f198c59b5fd34e80abc"
+ARG KONG_AMD64_SHA="60ef680e0fc4d2cf52934758e6a0dc0f173d2a3b32aca49c7eb31ab478c24583"
+ARG KONG_ARM64_SHA="5c23f448eeae1b363ece51d066405c13798ee08ca413097a23d9b5ccb49cbf35"
 
 # hadolint ignore=DL3018
 RUN set -eux; \

diff --git a/centos/Dockerfile b/centos/Dockerfile
diff --git a/centos/docker-entrypoint.sh b/centos/docker-entrypoint.sh
diff --git a/centos/kong.rpm b/centos/kong.rpm
diff --git a/customize/packer.lua b/customize/packer.lua
@@ -60,7 +60,7 @@ local platforms = {
     target_commands = {       -- run before installing in the target image
     },
   }, {
-    check = "yum --version",  -- check for CentOS + rhel
+    check = "yum --version",  -- check for rhel
     commands = {              -- run before anything else in build container
       "yum -y install git",
       "yum -y install unzip",

diff --git a/rhel/Dockerfile b/rhel/Dockerfile
@@ -4,10 +4,10 @@ FROM registry.access.redhat.com/ubi${RHEL_VERSION}/ubi
 
 MAINTAINER Kong
 
-ARG KONG_VERSION=2.7.1
+ARG KONG_VERSION=2.8.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="ba4cce4776fec353e706f09f1da1cca474094cb1619011fe9402f5f9b7735b08"
+ARG KONG_SHA256="c6780fe9503836be53cfd2203d18896b3713270fdebbf0ff04c1243cf0fa2371"
 
 LABEL name="Kong" \
       vendor="Kong" \

diff --git a/submit.sh b/submit.sh
@@ -130,7 +130,6 @@ git checkout -b release/$version
 if [ "$mode" = "patch" ]
 then
   sed "s|$prev-alpine|$version-alpine|;
-       s|$prev-centos|$version-centos|;
        s|$prev-ubuntu|$version-ubuntu|;
        s|$prev,|$version,|;
        s|$prevcommit|$commit|;
@@ -140,7 +139,6 @@ then
 elif [ "$mode" = "rc" -a "$rc" -gt 1 ]
 then
   sed "s|$prev-alpine|$version-alpine|;
-       s|$prev-centos|$version-centos|;
        s|$prev-ubuntu|$version-ubuntu|;
        s|, ${xy}rc$[rc-1]|, ${xy}rc${rc}|;
        s|$prev,|$version,|;
@@ -178,13 +176,6 @@ then
         print "Directory: ubuntu"
         print "Architectures: amd64, arm64v8"
         print ""
-        print "Tags: " v "-centos"
-        print "GitCommit: " commit
-        print "GitFetch: refs/tags/" v
-        print "Constraints: !aufs"
-        print "Directory: centos"
-        print "Architectures: amd64"
-        print ""
         before_first = 0
       } else {
         print
@@ -231,19 +222,12 @@ then
         print "Directory: ubuntu"
         print "Architectures: amd64, arm64v8"
         print ""
-        print "Tags: " v "-centos, " xy "-centos, centos"
-        print "GitCommit: " commit
-        print "GitFetch: refs/tags/" v
-        print "Directory: centos"
-        print "Architectures: amd64"
-        print ""
         before_first = 0
       }
       if (!(in_rc_tag == 1)) {
         gsub(", latest", "")
         gsub(", alpine", "")
         gsub(", ubuntu", "")
-        gsub(", centos", "")
         print
       }
       if (reset == 1) {

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
@@ -7,10 +7,10 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=2.7.1
+ARG KONG_VERSION=2.8.0
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="feeee661bbe44cf3ca2d4b748291dd3f9153f355fbc13ffeccb6fbc036249a89"
+ARG KONG_SHA256="f49c6733bf71d5a9079fa7238f8b8cbdab11077a6afd81077a025268c6611744"
 
 # hadolint ignore=DL3015
 RUN set -ex \

diff --git a/update.sh b/update.sh
@@ -67,16 +67,6 @@ pushd alpine
    sed -i.bak 's/ARG KONG_VERSION=.*/ARG KONG_VERSION='$version'/g' Dockerfile
 popd
 
-pushd centos
-   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_SHA256=.*/ARG KONG_SHA256=\"'$new_sha'\"/g' Dockerfile
-   sed -i.bak 's/ARG KONG_VERSION=.*/ARG KONG_VERSION='$version'/g' Dockerfile
-popd
-
 pushd rhel
    url=$(get_url Dockerfile amd64 "RHEL_VERSION=7")
    echo $url