From 716f385e7b28fff550244c23c724f114b7ee2ca3 Mon Sep 17 00:00:00 2001
From: Colin Hutchinson <chutchic@gmail.com>
Date: Thu, 25 Jun 2020 17:38:34 +0000
Subject: [PATCH] chore(amazonlinux2) place amazonlinux2 assets in a separate
 directory

---
 fpm-entrypoint.sh | 2 +-
 release-kong.sh   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh
index 01b84349..eaf680b1 100755
--- 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
index 393998b1..05b65c19 100755
--- a/release-kong.sh
+++ b/release-kong.sh
@@ -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