-
Notifications
You must be signed in to change notification settings - Fork 2.4k
bump kong to 3.7 #16896
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
bump kong to 3.7 #16896
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Diff for cd0ff60:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 60f5c13..9aea342 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,17 +13,6 @@ GitFetch: refs/tags/2.8.4
GitCommit: 1c31704cdc9bbd2c0a20e5479eb307140339582b
Directory: ubuntu
-Tags: 3.3.1-alpine, alpine
-GitFetch: refs/tags/3.3.1
-GitCommit: 2207aa20530f8a04290c82c9c2258717f7795080
-File: Dockerfile.apk
-
-Tags: 3.3.1-ubuntu, 3.3-ubuntu, 3.3.1, 3.3
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/3.3.1
-GitCommit: 2207aa20530f8a04290c82c9c2258717f7795080
-Directory: ubuntu
-
Tags: 3.4.2-ubuntu, 3.4-ubuntu, 3.4.2, 3.4
Architectures: amd64, arm64v8
GitFetch: refs/tags/3.4.2
@@ -36,8 +25,14 @@ GitFetch: refs/tags/3.5.0
GitCommit: e4ba2e351f3da34727fd016409a2669004b3fce0
Directory: ubuntu
-Tags: 3.6.1-ubuntu, 3.6-ubuntu, 3.6.1, 3.6, 3, latest, ubuntu
+Tags: 3.6.1-ubuntu, 3.6-ubuntu, 3.6.1, 3.6
Architectures: amd64, arm64v8
GitFetch: refs/tags/3.6.1
GitCommit: 4dec46ee7e14ddd3a10692814728ff85adb77f25
Directory: ubuntu
+
+Tags: 3.7.0-ubuntu, 3.7-ubuntu, 3.7.0, 3.7, 3, latest, ubuntu
+Architectures: amd64, arm64v8
+GitFetch: refs/tags/3.7.0
+GitCommit: 7c1f670b717d308affd4843c8cf2f5c4402b6794
+Directory: ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 01139bf..dcfe78c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,11 +4,6 @@ kong:2.8.4
kong:2.8.4-alpine
kong:2.8.4-ubuntu
kong:3
-kong:3.3
-kong:3.3-ubuntu
-kong:3.3.1
-kong:3.3.1-alpine
-kong:3.3.1-ubuntu
kong:3.4
kong:3.4-ubuntu
kong:3.4.2
@@ -21,6 +16,9 @@ kong:3.6
kong:3.6-ubuntu
kong:3.6.1
kong:3.6.1-ubuntu
-kong:alpine
+kong:3.7
+kong:3.7-ubuntu
+kong:3.7.0
+kong:3.7.0-ubuntu
kong:latest
kong:ubuntu
diff --git a/kong_3.3/Dockerfile b/kong_3.3/Dockerfile
deleted file mode 100644
index ecd6c56..0000000
diff --git a/kong_ubuntu/Dockerfile b/kong_3.6/Dockerfile
similarity index 100%
copy from kong_ubuntu/Dockerfile
copy to kong_3.6/Dockerfile
diff --git a/kong_3.3/docker-entrypoint.sh b/kong_3.6/docker-entrypoint.sh
similarity index 100%
rename from kong_3.3/docker-entrypoint.sh
rename to kong_3.6/docker-entrypoint.sh
diff --git a/kong_3.3/kong.deb b/kong_3.6/kong.deb
similarity index 100%
rename from kong_3.3/kong.deb
rename to kong_3.6/kong.deb
diff --git a/kong_alpine/Dockerfile.apk b/kong_alpine/Dockerfile.apk
deleted file mode 100644
index 57a1d97..0000000
diff --git a/kong_alpine/docker-entrypoint.sh b/kong_alpine/docker-entrypoint.sh
deleted file mode 100755
index 4aa71de..0000000
diff --git a/kong_alpine/kong.apk.tar.gz b/kong_alpine/kong.apk.tar.gz
deleted file mode 100644
index e69de29..0000000
diff --git a/kong_ubuntu/Dockerfile b/kong_ubuntu/Dockerfile
index 93abd00..68b964d 100644
--- a/kong_ubuntu/Dockerfile
+++ b/kong_ubuntu/Dockerfile
@@ -9,11 +9,11 @@ ARG EE_PORTS
COPY kong.deb /tmp/kong.deb
-ARG KONG_VERSION=3.6.1
+ARG KONG_VERSION=3.7.0
ENV KONG_VERSION $KONG_VERSION
-ARG KONG_AMD64_SHA="03b2aca93fd41b8dc0908754cef815433c1d3069ac842a1d078ca98105b230fd"
-ARG KONG_ARM64_SHA="b544bfe2ba4109335d26efb5e59029450f823c3a19b6aef77f6c93d5850142b0"
+ARG KONG_AMD64_SHA="71b946cac188653eb29714f21b98eb146cec536e05a5818a49007f9211e572d4"
+ARG KONG_ARM64_SHA="fb01282dfe9bf42ba27df30c2bc269aadac3ae3f298ba535f77b15a7bff2f6df"
# hadolint ignore=DL3015
RUN set -ex; \
@@ -26,7 +26,8 @@ RUN set -ex; \
&& if [ "$ASSET" = "ce" ] ; then \
apt-get install -y --no-install-recommends curl ca-certificates \
&& UBUNTU_CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) \
- && curl -fL https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-ubuntu-${UBUNTU_CODENAME}/pool/all/k/kong/kong_${KONG_VERSION}_$arch.deb -o /tmp/kong.deb \
+ && KONG_REPO=$(echo ${KONG_VERSION%.*} | sed 's/\.//') \
+ && curl -fL https://packages.konghq.com/public/gateway-$KONG_REPO/deb/ubuntu/pool/$UBUNTU_CODENAME/main/k/ko/kong_$KONG_VERSION/kong_${KONG_VERSION}_$arch.deb -o /tmp/kong.deb \
&& apt-get purge -y curl \
&& echo "$KONG_SHA256 /tmp/kong.deb" | sha256sum -c - \
|| exit 1; \ Relevant Maintainers:
|
LaurentGoderre
approved these changes
Jun 3, 2024
tianon
approved these changes
Jun 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a retry of #16876 , done in order to force a new build after we retagged.
Explanation #16876 (comment)