fix(ssl): adjust our base images to be more resiliant against ssl cha…

…nges. Drop jessie (#408) * fix(ssl): adjust our base images to be more resiliant against ssl changes * chore(jessie): drop jessie
Kong · Oct 8, 2021 · fb819ef · fb819ef
1 parent ba8c81b
commit fb819ef
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -128,7 +128,6 @@ pipeline {
                     steps {
                         sh 'mkdir -p /home/ubuntu/bin/'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
-                        sh 'export RESTY_IMAGE_TAG=jessie && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=stretch && 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=xenial|bionic|focal|6|7|8|jessie|stretch|buster|latest|latest
+RESTY_IMAGE_TAG=xenial|bionic|focal|6|7|8|stretch|buster|latest|latest
 PACKAGE_TYPE=deb|rpm|apk
 ```
 

diff --git a/dockerfiles/Dockerfile.apk b/dockerfiles/Dockerfile.apk
@@ -3,6 +3,7 @@ ARG RESTY_IMAGE_TAG="3"
 FROM alpine:${RESTY_IMAGE_TAG}
 
 RUN apk update \
+  && apk upgrade \
   && apk add ca-certificates wget coreutils patch grep \
   && update-ca-certificates \
   && apk add --virtual build-deps make gcc make g++ zlib-dev musl-dev pcre-dev \

diff --git a/dockerfiles/Dockerfile.deb b/dockerfiles/Dockerfile.deb
@@ -7,6 +7,7 @@ ARG RESTY_IMAGE_TAG="bionic"
 FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
         ca-certificates \

diff --git a/dockerfiles/Dockerfile.rpm b/dockerfiles/Dockerfile.rpm
@@ -6,5 +6,6 @@ ARG RESTY_IMAGE_TAG="7"
 
 FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
 
-RUN yum -y install wget tar readline-devel pcre-devel openssl-devel gcc curl unzip \
-  zlib-devel make gcc gcc-c++ bzip2 patch perl m4 git
+RUN yum update -y && \
+  yum -y install ca-certificates wget tar readline-devel pcre-devel openssl-devel \
+  gcc curl unzip zlib-devel make gcc gcc-c++ bzip2 patch perl m4 git
diff --git a/test/Dockerfile.test b/test/Dockerfile.test
@@ -17,7 +17,10 @@ ENV KONG_GO_PLUGINSERVER_VERSION $KONG_GO_PLUGINSERVER_VERSION
 RUN cp -R /tmp/build/* / || true
 RUN rm -rf /usr/local/bin/kong
 RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
-    apt-get update && apt-get install -y \
+    apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+    ca-certificates \
     tzdata \
     vim \
     jq \

diff --git a/test/build_container.sh b/test/build_container.sh
@@ -29,7 +29,7 @@ elif [ "$RESTY_IMAGE_BASE" == "centos" ] || [ "$RESTY_IMAGE_BASE" == "amazonlinu
   BUILD_DIR="centos"
 fi
 
-if [ "$RESTY_IMAGE_TAG" == "stretch" ] || [ "$RESTY_IMAGE_TAG" == "jessie" ]; 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