Update kong library

[gszr]

Hello, Docker Library maintainers! 👋🏻

Changelog for this PR:

• Remove old (< 2.8) versions from the list, so they do not get rebuilt
• Apply a new fix to our arm64 2.8.3 image

Thank you! 🚢 📦 🦍

[github-actions]

Diff for d42b913:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 069bd06..d5f285d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,52 +1,16 @@
 Maintainers: Kong Docker Maintainers <team-gateway@konghq.com> (@team-gateway-bot)
 GitRepo: https://github.com/Kong/docker-kong.git
 
-Tags: 2.5.2-alpine, 2.5.2, 2.5
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.5.2
-GitCommit: e6fbd10247d55eba63db13216666f9db4c6d3363
-Directory: alpine
-
-Tags: 2.5.2-ubuntu, 2.5-ubuntu
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.5.2
-GitCommit: e6fbd10247d55eba63db13216666f9db4c6d3363
-Directory: ubuntu
-
-Tags: 2.6.1-alpine, 2.6.1, 2.6
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.6.1
-GitCommit: aa4cf106f8933033f433cacc8f073fa4dbbeac21
-Directory: alpine
-
-Tags: 2.6.1-ubuntu, 2.6-ubuntu
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.6.1
-GitCommit: aa4cf106f8933033f433cacc8f073fa4dbbeac21
-Directory: ubuntu
-
-Tags: 2.7.2-alpine, 2.7.2, 2.7
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.7.2
-GitCommit: 456bfc908ed1f4fdbb348bafcf7385aeffdd421c
-Directory: alpine
-
-Tags: 2.7.2-ubuntu, 2.7-ubuntu
-Architectures: amd64, arm64v8
-GitFetch: refs/tags/2.7.2
-GitCommit: 456bfc908ed1f4fdbb348bafcf7385aeffdd421c
-Directory: ubuntu
-
 Tags: 2.8.3-alpine, 2.8.3, 2.8
 Architectures: amd64, arm64v8
 GitFetch: refs/tags/2.8.3
-GitCommit: 9538eec15456ce93d69a4a1ae9e379a28fd9040b
+GitCommit: 51604ac58ec41b3a57de95933b23dc3314552073
 Directory: alpine
 
 Tags: 2.8.3-ubuntu, 2.8-ubuntu
 Architectures: amd64, arm64v8
 GitFetch: refs/tags/2.8.3
-GitCommit: 9538eec15456ce93d69a4a1ae9e379a28fd9040b
+GitCommit: 51604ac58ec41b3a57de95933b23dc3314552073
 Directory: ubuntu
 
 Tags: 3.0.2-alpine, 3.0-alpine, 3.0.2, 3.0
diff --git a/_bashbrew-list b/_bashbrew-list
index dc71f14..c9b8fe8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,18 +1,3 @@
-kong:2.5
-kong:2.5-ubuntu
-kong:2.5.2
-kong:2.5.2-alpine
-kong:2.5.2-ubuntu
-kong:2.6
-kong:2.6-ubuntu
-kong:2.6.1
-kong:2.6.1-alpine
-kong:2.6.1-ubuntu
-kong:2.7
-kong:2.7-ubuntu
-kong:2.7.2
-kong:2.7.2-alpine
-kong:2.7.2-ubuntu
 kong:2.8
 kong:2.8-ubuntu
 kong:2.8.3
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index a9f0259..a0037a4 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,3 @@
-kong:2.5
-kong:2.5-ubuntu
-kong:2.6
-kong:2.6-ubuntu
-kong:2.7
-kong:2.7-ubuntu
 kong:2.8
 kong:2.8-ubuntu
 kong:3.0
diff --git a/kong_2.5-ubuntu/Dockerfile b/kong_2.5-ubuntu/Dockerfile
deleted file mode 100644
index dc1d964..0000000
diff --git a/kong_2.5-ubuntu/docker-entrypoint.sh b/kong_2.5-ubuntu/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.5-ubuntu/kong.deb b/kong_2.5-ubuntu/kong.deb
deleted file mode 100644
index 80931f4..0000000
diff --git a/kong_2.5/Dockerfile b/kong_2.5/Dockerfile
deleted file mode 100644
index 9c394f7..0000000
diff --git a/kong_2.5/docker-entrypoint.sh b/kong_2.5/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.5/kong.tar.gz b/kong_2.5/kong.tar.gz
deleted file mode 100644
index e69de29..0000000
diff --git a/kong_2.6-ubuntu/Dockerfile b/kong_2.6-ubuntu/Dockerfile
deleted file mode 100644
index 41cabe3..0000000
diff --git a/kong_2.6-ubuntu/docker-entrypoint.sh b/kong_2.6-ubuntu/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.6-ubuntu/kong.deb b/kong_2.6-ubuntu/kong.deb
deleted file mode 100644
index 80931f4..0000000
diff --git a/kong_2.6/Dockerfile b/kong_2.6/Dockerfile
deleted file mode 100644
index 55bfdcf..0000000
diff --git a/kong_2.6/docker-entrypoint.sh b/kong_2.6/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.6/kong.tar.gz b/kong_2.6/kong.tar.gz
deleted file mode 100644
index e69de29..0000000
diff --git a/kong_2.7-ubuntu/Dockerfile b/kong_2.7-ubuntu/Dockerfile
deleted file mode 100644
index 6033a75..0000000
diff --git a/kong_2.7-ubuntu/docker-entrypoint.sh b/kong_2.7-ubuntu/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.7-ubuntu/kong.deb b/kong_2.7-ubuntu/kong.deb
deleted file mode 100644
index 80931f4..0000000
diff --git a/kong_2.7/Dockerfile b/kong_2.7/Dockerfile
deleted file mode 100644
index 0825e2a..0000000
diff --git a/kong_2.7/docker-entrypoint.sh b/kong_2.7/docker-entrypoint.sh
deleted file mode 100755
index f37496e..0000000
diff --git a/kong_2.7/kong.tar.gz b/kong_2.7/kong.tar.gz
deleted file mode 100644
index e69de29..0000000
diff --git a/kong_2.8/Dockerfile b/kong_2.8/Dockerfile
index 3c75dc1..db50741 100644
--- a/kong_2.8/Dockerfile
+++ b/kong_2.8/Dockerfile
@@ -13,8 +13,8 @@ COPY kong.tar.gz /tmp/kong.tar.gz
 ARG KONG_VERSION=2.8.3
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="962ac92c9834cb59f1d6563412714f3d6eecfe6c6849a84cfcbe7a4b3facbf46"
-ARG KONG_ARM64_SHA="7076e6ee6a03df86795a1a08cf86e0349a150095e61be266db462cb7de9fd745"
+ARG KONG_AMD64_SHA="46e8ccd60fdcfb44a02b7ff9cfc79b701bf1275ec6ba88138d98317509c682fa"
+ARG KONG_ARM64_SHA="f6c90eb9b126e049859f037e81f070f4116ac701c4e4b9ad2d1ec574fbe44bb3"
 
 # hadolint ignore=DL3018
 RUN set -eux; \

Relevant Maintainers:

• kong: @team-gateway-bot

[gszr]

Fixes Kong/docker-kong#627

[gszr]

Hey Maintainers!

I am a bit confused. The kong:2.8.3-ubuntu job passed (bionic dep was pulled successfully), but the Naughty is being naughty and failing 😄 Any tips?

[yosifkit]

Sorry, the test is a little broken right now. Your PR is fine.

[gszr]

@yosifkit
The 2.8.3 label only has an amd64 build, while the 2.8 label has both arm64 and amd64. Any clues? Nothing seems off in the library file itself.

[yosifkit]

The 2.8 label can use the last successful old image that was tagged as 2.8 for a specific architecture whereas the 2.8.3 will only get an image tagged as 2.8.3. This helps smooth the transition of version bumps when one architecture is ready before others (rather than arches being dropped while the new version builds). The manifest list will be eventually updated once the new architecture+version image is ready.

Builds: https://doi-janky.infosiftr.net/job/multiarch/view/images/view/kong/
Staging repo where arm64v8 kong images are pushed before being combined into the manifest list under hub.docker.com/_/kong: https://hub.docker.com/r/arm64v8/kong

[gszr]

The 2.8 label can use the last successful old image that was tagged as 2.8 for a specific architecture whereas the 2.8.3 will only get an image tagged as 2.8.3. This helps smooth the transition of version bumps when one architecture is ready before others (rather than arches being dropped while the new version builds). The manifest list will be eventually updated once the new architecture+version image is ready.

I didn't check which patch version the 2.8 had before asking -duh! Thanks for the detailed reply.

Builds: https://doi-janky.infosiftr.net/job/multiarch/view/images/view/kong/ Staging repo where arm64v8 kong images are pushed before being combined into the manifest list under hub.docker.com/_/kong: https://hub.docker.com/r/arm64v8/kong

Neat. I will watch the build logs. (Any plans to use "Jenkins Blue Ocean" there? :)

[tianon]

Unfortunately, Jenkins Blue Ocean has been really buggy (and the layout is really off-putting) every time I try it out, so we don't plan to use it any time soon.