Merge pull request #448 from Kong/if/eol-debians

[ENGEN-450] chore(debian): remove EOLed 8
Kong · Mar 29, 2022 · 77f7bf9 · 77f7bf9
2 parents 254b06e + 7c295ce
commit 77f7bf9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -132,7 +132,6 @@ pipeline {
                         sh 'mkdir -p /home/ubuntu/bin/'
                         sh 'echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin || true'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
-                        sh 'export RESTY_IMAGE_TAG=8 && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=9 && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=10 && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=11 && make package-kong && make test && make cleanup'

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ The most common ones are the following:
 
 ```
 RESTY_IMAGE_BASE=ubuntu|centos|rhel|debian|alpine|amazonlinux
-RESTY_IMAGE_TAG=16.04|18.04|20.04|6|7|8|9|10|11|latest|latest
+RESTY_IMAGE_TAG=16.04|18.04|20.04|7|8|9|10|11|latest|latest
 PACKAGE_TYPE=deb|rpm|apk
 ```
 

diff --git a/test/build_container.sh b/test/build_container.sh
@@ -30,8 +30,7 @@ elif [ "$RESTY_IMAGE_BASE" == "centos" ] || [ "$RESTY_IMAGE_BASE" == "amazonlinu
   BUILD_DIR="centos"
 fi
 
-if [ "$RESTY_IMAGE_TAG" == "stretch" ] ||
-  { [ "$RESTY_IMAGE_BASE" == "debian" ] && [ "$RESTY_IMAGE_TAG" == "8" ]; } then
+if [ "$RESTY_IMAGE_TAG" == "stretch" ]; then
   sed -i 's/apt install --yes /gdebi -n /g' docker-kong/ubuntu/Dockerfile
   sed -i 's/unzip git/unzip git gdebi/g' docker-kong/ubuntu/Dockerfile
 fi