Merge pull request #311 from Kong/fix/zlib-dependencies

fix(zlib) adjust the zlib dependencies

fpm-entrypoint.sh

@@ -7,26 +7,21 @@ cd /tmp/build
 FPM_PARAMS=""
 if [ "$RESTY_IMAGE_BASE" == "ubuntu" ] || [ "$RESTY_IMAGE_BASE" == "debian" ]; then
   PACKAGE_TYPE="deb"
-  FPM_PARAMS="-d libpcre3 -d perl -d zlibc -d zlib1g-dev"
+  FPM_PARAMS="-d libpcre3 -d perl -d zlib1g-dev"
   OUTPUT_FILE_SUFFIX=".${RESTY_IMAGE_TAG}"
-elif [ "$RESTY_IMAGE_BASE" == "centos" ]; then
-  PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib"
-  OUTPUT_FILE_SUFFIX=".el${RESTY_IMAGE_TAG}"
-elif [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
+elif [ "$RESTY_IMAGE_BASE" == "centos" ] || [ "$RESTY_IMAGE_BASE" == "rhel" ] || [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
   PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib"
+  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib-devel"
   OUTPUT_FILE_SUFFIX=".rhel${RESTY_IMAGE_TAG}"
   if [ "$RESTY_IMAGE_TAG" == "7" ]; then
     FPM_PARAMS="$FPM_PARAMS -d hostname"
   fi
-elif [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
-  PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes"
-  OUTPUT_FILE_SUFFIX=".aws"
-fi
-if [ "$RESTY_IMAGE_TAG" == "bullseye" ]; then
-  FPM_PARAMS="-d libpcre3 -d perl -d zlib1g-dev"
+  if [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
+    OUTPUT_FILE_SUFFIX=".aws"
+  fi
+  if [ "$RESTY_IMAGE_BASE" == "centos" ]; then
+    OUTPUT_FILE_SUFFIX=".el${RESTY_IMAGE_TAG}"
+  fi
 fi
 OUTPUT_FILE_SUFFIX="${OUTPUT_FILE_SUFFIX}."$(echo ${BUILDPLATFORM} | awk -F "/" '{ print $2}')
 

release-kong.sh

@@ -55,7 +55,10 @@ elif [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
   REPOSITORY_TYPE="${REPOSITORY_TYPE:-rpm}"
   REPOSITORY_NAME="${REPOSITORY_NAME:-$KONG_PACKAGE_NAME-rpm}"
   REPOSITORY_OS_NAME="${REPOSITORY_OS_NAME:-aws}"
-  OUTPUT_FILE_SUFFIX=".aws${RESTY_IMAGE_TAG}.${ARCHITECTURE}.rpm"
+  OUTPUT_FILE_SUFFIX=".aws.${ARCHITECTURE}.rpm"
+  if [ "$RESTY_IMAGE_TAG" == "2" ]; then
+    BINTRAY_DIRECTORY="amazonlinux/amazonlinux2"
+  fi
 elif [ "$RESTY_IMAGE_BASE" == "src" ]; then
   BINTRAY_DIRECTORY=""
   REPOSITORY_TYPE="${REPOSITORY_TYPE:-generic}"
@@ -64,9 +67,6 @@ elif [ "$RESTY_IMAGE_BASE" == "src" ]; then
   OUTPUT_FILE_SUFFIX=".tar.gz"
   curl -L https://github.com/Kong/kong/archive/$KONG_VERSION.tar.gz -o output/$KONG_PACKAGE_NAME-$KONG_VERSION$OUTPUT_FILE_SUFFIX
 fi
-if [ "$RESTY_IMAGE_BASE" == "amazonlinux" ] && [ "$RESTY_IMAGE_TAG" == "2" ]; then
-  BINTRAY_DIRECTORY="amazonlinux/amazonlinux2"
-fi
 
 if [ "$RELEASE_DOCKER_ONLY" == "true" ]; then
   exit 0