-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
bump kong to 3.9.0, delete EOL'd 3.5.0 #18117
Merged
Merged
Conversation
This file contains 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.
LaurentGoderre
previously approved these changes
Dec 17, 2024
This comment has been minimized.
This comment has been minimized.
Diff for 7fa6134:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 38d2243..07a7a1d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -17,12 +17,6 @@ GitFetch: refs/tags/3.4.2
GitCommit: e07de903edf213445a0540172d51529ac344b448
Directory: ubuntu
-Tags: 3.5.0-ubuntu, 3.5-ubuntu, 3.5.0, 3.5
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/3.5.0
-GitCommit: 8814c97a408d76ed004b05ea96f0d9eadf9b36be
-Directory: ubuntu
-
Tags: 3.6.1-ubuntu, 3.6-ubuntu, 3.6.1, 3.6
Architectures: amd64, arm64v8
GitFetch: refs/tags/3.6.1
@@ -35,8 +29,14 @@ GitFetch: refs/tags/3.7.1
GitCommit: 83bc64115d6487c754a6d7fdf43254ad9840058a
Directory: ubuntu
-Tags: 3.8.0-ubuntu, 3.8-ubuntu, 3.8.0, 3.8, 3, latest, ubuntu
+Tags: 3.8.0-ubuntu, 3.8-ubuntu, 3.8.0, 3.8
Architectures: amd64, arm64v8
GitFetch: refs/tags/3.8.0
GitCommit: 1f5199f7da45c17f4344b811397e89899a160040
Directory: ubuntu
+
+Tags: 3.9.0-ubuntu, 3.9-ubuntu, 3.9.0, 3.9, 3, latest, ubuntu
+Architectures: amd64, arm64v8
+GitFetch: refs/tags/3.9.0
+GitCommit: d46098c09b6198efb71682fe7209bd6467bf3f67
+Directory: ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 5b1aca5..7d2a345 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,10 +10,6 @@ kong:3.4
kong:3.4-ubuntu
kong:3.4.2
kong:3.4.2-ubuntu
-kong:3.5
-kong:3.5-ubuntu
-kong:3.5.0
-kong:3.5.0-ubuntu
kong:3.6
kong:3.6-ubuntu
kong:3.6.1
@@ -26,5 +22,9 @@ kong:3.8
kong:3.8-ubuntu
kong:3.8.0
kong:3.8.0-ubuntu
+kong:3.9
+kong:3.9-ubuntu
+kong:3.9.0
+kong:3.9.0-ubuntu
kong:latest
kong:ubuntu
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e6de4e9..7a1ad16 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,7 +1,7 @@
kong:2
kong:2.8-ubuntu
kong:3.4
-kong:3.5
kong:3.6
kong:3.7
+kong:3.8
kong:ubuntu
diff --git a/kong_3.5/Dockerfile b/kong_3.5/Dockerfile
deleted file mode 100644
index 2e50102..0000000
diff --git a/kong_ubuntu/Dockerfile b/kong_3.8/Dockerfile
similarity index 100%
copy from kong_ubuntu/Dockerfile
copy to kong_3.8/Dockerfile
diff --git a/kong_3.5/docker-entrypoint.sh b/kong_3.8/docker-entrypoint.sh
similarity index 100%
rename from kong_3.5/docker-entrypoint.sh
rename to kong_3.8/docker-entrypoint.sh
diff --git a/kong_3.5/kong.deb b/kong_3.8/kong.deb
similarity index 100%
rename from kong_3.5/kong.deb
rename to kong_3.8/kong.deb
diff --git a/kong_ubuntu/Dockerfile b/kong_ubuntu/Dockerfile
index bcd8df7..8b526fb 100644
--- a/kong_ubuntu/Dockerfile
+++ b/kong_ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
@@ -9,11 +9,11 @@ ARG EE_PORTS
COPY kong.deb /tmp/kong.deb
-ARG KONG_VERSION=3.8.0
+ARG KONG_VERSION=3.9.0
ENV KONG_VERSION $KONG_VERSION
-ARG KONG_AMD64_SHA="d7f3bb1b34128ebefc7c1dadf552b88903631d33e479715545c1e1b8f9468987"
-ARG KONG_ARM64_SHA="21a35f15c1ee96996da8739c9bcc937e164b5a075db64c0a7e17b5443af458bf"
+ARG KONG_AMD64_SHA="c05ef5dc312676e032627c1cb0934056061d97b43ed8eb20bea9218916d90b40"
+ARG KONG_ARM64_SHA="b487f95079a3a8ec07d331725e02b5a489e979f0d5e95ad16278bf60a665b34d"
# hadolint ignore=DL3015
RUN set -ex; \
diff --git a/kong_ubuntu/docker-entrypoint.sh b/kong_ubuntu/docker-entrypoint.sh
index 4aa71de..bd8f024 100755
--- a/kong_ubuntu/docker-entrypoint.sh
+++ b/kong_ubuntu/docker-entrypoint.sh
@@ -46,7 +46,7 @@ if [[ "$1" == "kong" ]]; then
# remove all dangling sockets in $PREFIX dir before starting Kong
LOGGED_SOCKET_WARNING=0
- for localfile in "$PREFIX"/*; do
+ for localfile in "$PREFIX"/* "$PREFIX"/sockets/*; do
if [ -S "$localfile" ]; then
if (( LOGGED_SOCKET_WARNING == 0 )); then
printf >&2 'WARN: found dangling unix sockets in the prefix directory ' Relevant Maintainers:
|
@LaurentGoderre I've reconstructed the docker-kong release/tag to include the proper Noble checksums and got this PR updated to use that. |
LaurentGoderre
approved these changes
Dec 20, 2024
@LaurentGoderre thanks! 🎉 |
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.
No description provided.