Merge pull request #301 from Kong/chore/amazonlinux2

chore(amazonlinux2) put amazonlinux2 assets in separate directory on bintray
Kong · Jul 1, 2020 · b4b9fb6 · b4b9fb6
2 parents 3925169 + 716f385
commit b4b9fb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh
@@ -23,7 +23,7 @@ elif [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
 elif [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
   PACKAGE_TYPE="rpm"
   FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes"
-  OUTPUT_FILE_SUFFIX=".aws${RESTY_IMAGE_TAG}"
+  OUTPUT_FILE_SUFFIX=".aws"
 fi
 if [ "$RESTY_IMAGE_TAG" == "bullseye" ]; then
   FPM_PARAMS="-d libpcre3 -d perl -d zlib1g-dev"

diff --git a/release-kong.sh b/release-kong.sh
@@ -55,7 +55,7 @@ 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${RESTY_IMAGE_TAG}.${ARCHITECTURE}.rpm"
 elif [ "$RESTY_IMAGE_BASE" == "src" ]; then
   BINTRAY_DIRECTORY=""
   REPOSITORY_TYPE="${REPOSITORY_TYPE:-generic}"
@@ -64,6 +64,9 @@ 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