From 94433d2a61d31a646187cdaeaabde5f6083a420e Mon Sep 17 00:00:00 2001
From: Enrique Garcia Cota <kikito@gmail.com>
Date: Mon, 24 Jun 2024 19:28:19 +0200
Subject: [PATCH 1/2] fix(2.8.x): remove ubuntu arm from 2.8.x

---
 ubuntu/Dockerfile | 6 +-----
 update.sh         | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index b03945fd..1c8f4697 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -13,15 +13,11 @@ ARG KONG_VERSION=3.7.1
 ENV KONG_VERSION $KONG_VERSION
 
 ARG KONG_AMD64_SHA="58e380961fc90c6b4dfd62f4ee596ab053afe5ae72a93445c4356f496f2dc9ec"
-ARG KONG_ARM64_SHA="602a68cf3a09bbea26106d4bd4041c242d7913e40582d18cac0f6958aad78f72"
 
 # hadolint ignore=DL3015
 RUN set -ex; \
     arch=$(dpkg --print-architecture); \
-    case "${arch}" in \
-      amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \
-      arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \
-    esac; \
+    KONG_SHA256=$KONG_AMD64_SHA ; \
     apt-get update \
     && if [ "$ASSET" = "ce" ] ; then \
       apt-get install -y --no-install-recommends curl ca-certificates \
diff --git a/update.sh b/update.sh
index 4a50763f..63a98227 100755
--- a/update.sh
+++ b/update.sh
@@ -70,12 +70,6 @@ pushd ubuntu
 
    sed -i.bak 's/ARG KONG_AMD64_SHA=.*/ARG KONG_AMD64_SHA=\"'$new_sha'\"/g' Dockerfile
 
-   url=$(get_url Dockerfile arm64 "UBUNTU_CODENAME=jammy")
-   echo $url
-   curl -fL $url -o /tmp/kong
-   new_sha=$(sha256sum /tmp/kong | cut -b1-64)
-
-   sed -i.bak 's/ARG KONG_ARM64_SHA=.*/ARG KONG_ARM64_SHA=\"'$new_sha'\"/g' Dockerfile
    sed -i.bak 's/ARG KONG_VERSION=.*/ARG KONG_VERSION='$version'/g' Dockerfile
 popd
 

From 61c3ba7acb28d3fbf877d1ee257410463ccbe1a3 Mon Sep 17 00:00:00 2001
From: Enrique Garcia Cota <kikito@gmail.com>
Date: Mon, 24 Jun 2024 19:28:51 +0200
Subject: [PATCH 2/2] chore(*) bump to Kong 2.8.5

---
 Dockerfile.deb    | 4 ++--
 Dockerfile.rpm    | 4 ++--
 ubuntu/Dockerfile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.deb b/Dockerfile.deb
index f25fda18..894c3dfc 100644
--- a/Dockerfile.deb
+++ b/Dockerfile.deb
@@ -2,10 +2,10 @@
 FROM debian:bullseye-20230502-slim
 
 LABEL maintainer="Kong Docker Maintainers <docker@konghq.com> (@team-gateway-bot)"
-ARG KONG_VERSION=3.7.1
+ARG KONG_VERSION=2.8.5
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="df13bb5efddc35693a349d742d4e2948148f3adce0b8557b7ea58ddba6789b13"
+ARG KONG_SHA256="9ae11fb9e748caaf564e825b4cbfd58a25a6ccbf0d6a470174c2138680a8f7a3"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
diff --git a/Dockerfile.rpm b/Dockerfile.rpm
index d0e418f2..11cd9df8 100644
--- a/Dockerfile.rpm
+++ b/Dockerfile.rpm
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7@sha256:6910799b75ad41f00891
 
 LABEL maintainer="Kong Docker Maintainers <docker@konghq.com> (@team-gateway-bot)"
 
-ARG KONG_VERSION=3.7.1
+ARG KONG_VERSION=2.8.5
 ENV KONG_VERSION $KONG_VERSION
 
 # RedHat required labels
@@ -18,7 +18,7 @@ LABEL name="Kong" \
 # RedHat required LICENSE file approved path
 COPY LICENSE /licenses/
 
-ARG KONG_SHA256="e5faf8fb843c4eba5b131a41e727eab0e96f2eea4584bbeb9e6f867d4b1ee96d"
+ARG KONG_SHA256="2e82cc14aef707796c952d38c835c9e0abc0e3ccdc94f1d752118699a62672fb"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 1c8f4697..aa875fde 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -9,10 +9,10 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=3.7.1
+ARG KONG_VERSION=2.8.5
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="58e380961fc90c6b4dfd62f4ee596ab053afe5ae72a93445c4356f496f2dc9ec"
+ARG KONG_AMD64_SHA="efba2bb8b1cb567bc90cc371e80503c558cbc74377b34609552ae2273def3fe3"
 
 # hadolint ignore=DL3015
 RUN set -ex; \