Merge branch 'master' into master

.bin/bashbrew-buildkit-env-setup.sh

@@ -47,7 +47,7 @@ _bashbrew_buildkit_env_setup() {
 	local vars='{}'
 
 	local dockerfileTag
-	dockerfileTag="$(grep <<<"$externalPins" -m1 '^docker/dockerfile:')"
+	dockerfileTag="$(grep <<<"$externalPins" -m1 '^tianon/buildkit:')"
 	dockerfileTag="$(_resolve_external_pins "$dockerfileTag")"
 	vars="$(_jq_setenv <<<"$vars" BASHBREW_BUILDKIT_SYNTAX "$dockerfileTag")"
 
@@ -63,11 +63,13 @@ _bashbrew_buildkit_env_setup() {
 			buildxBuilder="$("$binDir/docker-buildx-ensure.sh")" # reminder: this script *requires* BASHBREW_ARCH (to avoid "accidental amd64" mistakes)
 			vars="$(_jq_setenv <<<"$vars" BUILDX_BUILDER "$buildxBuilder")"
 
-			local sbomTag
+			local sbomGenerator
 			# https://hub.docker.com/r/docker/scout-sbom-indexer/tags
-			sbomTag="$(grep <<<"$externalPins" -m1 '^docker/scout-sbom-indexer:')"
-			sbomTag="$(_resolve_external_pins "$sbomTag")"
-			vars="$(_jq_setenv <<<"$vars" BASHBREW_BUILDKIT_SBOM_GENERATOR "$sbomTag")"
+			sbomGenerator="$(grep <<<"$externalPins" -m1 '^docker/scout-sbom-indexer:')"
+			sbomGenerator="$(_resolve_external_pins "$sbomGenerator")"
+			# https://github.com/moby/buildkit/pull/5372 - "EXTRA_SCANNERS" is an optional parameter to the Scout SBOM Indexer
+			sbomGenerator+=',"EXTRA_SCANNERS=php-composer-lock,erlang-otp-application,lua-rock-cataloger,swipl-pack-cataloger,opam-cataloger"'
+			vars="$(_jq_setenv <<<"$vars" BASHBREW_BUILDKIT_SBOM_GENERATOR "$sbomGenerator")"
 			;;
 	esac
 

.external-pins/docker/scout-sbom-indexer___1

@@ -0,0 +1 @@
+sha256:a383f8c6b54bfd91a9ad70fc34aab994d379514bf0f2601e225eed80213710c6

.external-pins/mcr.microsoft.com/windows/nanoserver___1809

@@ -1 +1 @@
-sha256:736f8845da1c7bbc9510b419abddb870230485e74644a96e0001a21e1ca4c172
+sha256:d96a6c2108e1449c872cc2b224a9b3444fa1415b4d6947280aba2d2bb3bd0025

.external-pins/mcr.microsoft.com/windows/nanoserver___ltsc2022

@@ -1 +1 @@
-sha256:cc9f6a1334190c1f18a905f56d285132e562a9a1ce18ff9476cfaf95194aa0b7
+sha256:55474b390b2d25e98450356b381d6dc422e15fb79808970f724c0f34df0b217e

.external-pins/mcr.microsoft.com/windows/nanoserver___ltsc2025

@@ -0,0 +1 @@
+sha256:d584aae93e84d61c8a3280ed3a5d5a6d397c0214a2902acadb8b17b0b00c70e8

.external-pins/mcr.microsoft.com/windows/servercore___1809

@@ -1 +1 @@
-sha256:41f42aa4ad39d85e4d30642b8111ca6454ca2275f188f012934b9afbaf63a647
+sha256:fb07dd14e84db4b84909be0a989597c31e28e199e7f47964fce763623d68e5d9

.external-pins/mcr.microsoft.com/windows/servercore___ltsc2022

@@ -1 +1 @@
-sha256:581d6056a224ef0b898e3b87982275b1c63c7ff90108f058d81842254f8b914c
+sha256:a7faef3c463f53996b00abff1cad6e979c75230bf9a55fdce77fe99c764971a5

.external-pins/mcr.microsoft.com/windows/servercore___ltsc2025

@@ -0,0 +1 @@
+sha256:f6153b44882e7ada8fa17123cfca1da3f29ea7fbe062c9e931240dc837aa4256

.external-pins/redhat/ubi8-minimal___latest

@@ -1 +1 @@
-sha256:de2a0a20c1c3b39c3de829196de9694d09f97cd18fda1004de855ed2b4c841ba
+sha256:cf095e5668919ba1b4ace3888107684ad9d587b1830d3eb56973e6a54f456e67

.external-pins/redhat/ubi8___latest

@@ -1 +1 @@
-sha256:44d75007b39e0e1bbf1bcfd0721245add54c54c3f83903f8926fb4bef6827aa2
+sha256:2e863fb65e595839633113300a0c6709e9af81523a30001290068265c121a927

.external-pins/redhat/ubi9-minimal___latest

@@ -1 +1 @@
-sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a
+sha256:b87097994ed62fbf1de70bc75debe8dacf3ea6e00dd577d74503ef66452c59d6

.external-pins/redhat/ubi9___latest

@@ -1 +1 @@
-sha256:081c96d1b1c7cd1855722d01f1ca53360510443737b1eb33284c6c4c330e537c
+sha256:53d6c19d664f4f418ce5c823d3a33dbb562a2550ea249cf07ef10aa063ace38f

.external-pins/tianon/buildkit___0.16

@@ -0,0 +1 @@
+sha256:3c0f01acf6ea6930b49c26391124f0eb5c3599c559835399ee3bfa84166815e9

.github/CODEOWNERS

@@ -1,11 +1,26 @@
 *  @docker-library/maintainers
 
 # give Laurent a bit more responsibility / authority on images where he's comfortable and knowledgeable 🎉
+/library/bash             @LaurentGoderre  @docker-library/maintainers
+/library/docker           @LaurentGoderre  @docker-library/maintainers
 /library/express-gateway  @LaurentGoderre  @docker-library/maintainers
 /library/ghost            @LaurentGoderre  @docker-library/maintainers
+/library/httpd            @LaurentGoderre  @docker-library/maintainers
+/library/kong             @LaurentGoderre  @docker-library/maintainers
+/library/mongo            @LaurentGoderre  @docker-library/maintainers
 /library/mongo-express    @LaurentGoderre  @docker-library/maintainers
+/library/nginx            @LaurentGoderre  @docker-library/maintainers
 /library/node             @LaurentGoderre  @docker-library/maintainers
-/library/httpd            @LaurentGoderre  @docker-library/maintainers
+/library/oraclelinux      @LaurentGoderre  @docker-library/maintainers
+/library/postgres         @LaurentGoderre  @docker-library/maintainers
+/library/python           @LaurentGoderre  @docker-library/maintainers
+/library/rabbitmq         @LaurentGoderre  @docker-library/maintainers
+/library/redis            @LaurentGoderre  @docker-library/maintainers
+/library/redmine          @LaurentGoderre  @docker-library/maintainers
+/library/registry         @LaurentGoderre  @docker-library/maintainers
+/library/ruby             @LaurentGoderre  @docker-library/maintainers
+/library/traefik          @LaurentGoderre  @docker-library/maintainers
+/library/ubuntu           @LaurentGoderre  @docker-library/maintainers
 
 # make sure we check with Laurent before we update our SBOM indexer (he follows and is involved in those releases more closely than the rest of us) 👀
 /.external-pins/docker/scout-sbom-indexer*  @LaurentGoderre

.github/workflows/.bashbrew/action.yml

@@ -10,8 +10,8 @@ runs:
 
     # these two version numbers are intentionally as close together as I could possibly get them because no matter what I tried, GitHub will not allow me to DRY them (can't have any useful variables in `uses:` and can't even have YAML references to steal it in `env:` or something)
     - shell: 'bash -Eeuo pipefail -x {0}'
-      run:    echo BASHBREW_VERSION=v0.1.12 >> "$GITHUB_ENV"
-    - uses: docker-library/[email protected].12
+      run:    echo BASHBREW_VERSION=v0.1.13 >> "$GITHUB_ENV"
+    - uses: docker-library/[email protected].13
       if: inputs.build == 'host'
 
     - run: docker build --pull --tag oisupport/bashbrew:base "https://github.com/docker-library/bashbrew.git#$BASHBREW_VERSION"

.github/workflows/munge-pr.yml

@@ -15,6 +15,17 @@ env:
   # https://github.com/docker-library/bashbrew/issues/10
   GIT_LFS_SKIP_SMUDGE: 1
 
+# limit to one run at a time per pull request
+# no cancel-in-progress so that the running diff comment can finish before the next since the old diff could be helpful for review
+concurrency:
+  # this should use "github.ref", but:
+  # "For pull requests events except pull_request_target, it is refs/pull/<pr_number>/merge. pull_request_target events have the ref from the base branch." 🙃
+  # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#github-context
+  #group: ${{ github.workflow }}-${{ github.ref }}
+  # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: false
+
 jobs:
 
   gather:

.github/workflows/test-pr.yml

@@ -13,7 +13,7 @@ env:
 
 # cancel existing runs if user makes another push
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:

Dockerfile

@@ -24,7 +24,7 @@ ENV BASHBREW_LIBRARY $DIR/library
 # crane for diff-pr.sh
 # https://gcr.io/go-containerregistry/crane:latest
 # https://explore.ggcr.dev/?image=gcr.io/go-containerregistry/crane:latest
-COPY --from=gcr.io/go-containerregistry/crane@sha256:d0e5cc313e7388a573bb4cfb980a935bb740c5787df7d90f7066b8e8146455ed /ko-app/crane /usr/local/bin/
+COPY --from=gcr.io/go-containerregistry/crane@sha256:fc86bcad43a000c2a1ca926a1e167db26c053cebc3fa5d14285c72773fb8c11d /ko-app/crane /usr/local/bin/
 
 WORKDIR $DIR
 COPY . $DIR

library/adminer

@@ -3,14 +3,4 @@
 Maintainers: Tim Düsterhus <[email protected]> (@TimWolla)
 GitRepo: https://github.com/TimWolla/docker-adminer.git
 
-Tags: 4.8.1-standalone, 4-standalone, standalone, 4.8.1, 4, latest
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c9c54b18f79a66409a3153a94f629ea68f08647c
-GitFetch: refs/heads/debian-packages
-Directory: 4
-
-Tags: 4.8.1-fastcgi, 4-fastcgi, fastcgi
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c9c54b18f79a66409a3153a94f629ea68f08647c
-GitFetch: refs/heads/debian-packages
-Directory: 4/fastcgi
+# https://github.com/docker-library/docs/pull/2476

library/aerospike

@@ -3,14 +3,14 @@ Maintainers: Lucien Volmar <[email protected]> (@volmarl),
              Phuc Vinh <[email protected]> (@pvinh-spike),
              Kevin Porter <[email protected]> (@kportertx)
 
-Tags: ee-7.1.0.2, ee-7.1.0.2_1
+Tags: ee-8.0.0.1, ee-8.0.0.1_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: feb210615277101e394d632493807e8b65f44b5d
-Directory: enterprise/ubuntu22.04
+GitCommit: 7cabac1129aeadbbf3c13eafa4207f822bc4e2f1
+Directory: enterprise/ubuntu24.04
 
-Tags: ce-7.1.0.2, ce-7.1.0.2_1
+Tags: ce-8.0.0.1, ce-8.0.0.1_1
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/aerospike/aerospike-server.docker.git
-GitCommit: feb210615277101e394d632493807e8b65f44b5d
-Directory: community/ubuntu22.04
+GitCommit: 7cabac1129aeadbbf3c13eafa4207f822bc4e2f1
+Directory: community/ubuntu24.04

library/almalinux

@@ -1,37 +1,55 @@
-# This file was generated on https://github.com/AlmaLinux/container-images/actions/runs/9305535759
+# This file was generated on https://github.com/AlmaLinux/container-images/actions/runs/11899782931
 Maintainers: The AlmaLinux OS Foundation <[email protected]> (@AlmaLinux)
 GitRepo: https://github.com/AlmaLinux/container-images.git
 
-Tags: 8, 8.10, 8.10-20240528
+Tags: 10-kitten, 10-kitten-20241024
+GitFetch: refs/heads/10-kitten
+GitCommit: a1cecc826bfdd29e027ffdbfb73793cd64afe3f3
+amd64-Directory: default/amd64/
+arm64v8-Directory: default/arm64/
+ppc64le-Directory: default/ppc64le/
+s390x-Directory: default/s390x/
+Architectures: amd64, arm64v8, ppc64le, s390x
+
+Tags: 10-kitten-minimal, 10-kitten-minimal-20241024
+GitFetch: refs/heads/10-kitten
+GitCommit: a1cecc826bfdd29e027ffdbfb73793cd64afe3f3
+amd64-Directory: minimal/amd64/
+arm64v8-Directory: minimal/arm64/
+ppc64le-Directory: minimal/ppc64le/
+s390x-Directory: minimal/s390x/
+Architectures: amd64, arm64v8, ppc64le, s390x
+
+Tags: 8, 8.10, 8.10-20240923
 GitFetch: refs/heads/8
-GitCommit: 88d9aea4fbb24eee1aaf9184954e583993e750f9
+GitCommit: 9220c28666f44af82172cba59a3ddc30fbae1cb7
 amd64-Directory: default/amd64/
 arm64v8-Directory: default/arm64/
 ppc64le-Directory: default/ppc64le/
 s390x-Directory: default/s390x/
 Architectures: amd64, arm64v8, ppc64le, s390x
 
-Tags: 8-minimal, 8.10-minimal, 8.10-minimal-20240528
+Tags: 8-minimal, 8.10-minimal, 8.10-minimal-20240923
 GitFetch: refs/heads/8
-GitCommit: 88d9aea4fbb24eee1aaf9184954e583993e750f9
+GitCommit: 9220c28666f44af82172cba59a3ddc30fbae1cb7
 amd64-Directory: minimal/amd64/
 arm64v8-Directory: minimal/arm64/
 ppc64le-Directory: minimal/ppc64le/
 s390x-Directory: minimal/s390x/
 Architectures: amd64, arm64v8, ppc64le, s390x
 
-Tags: latest, 9, 9.4, 9.4-20240530
+Tags: latest, 9, 9.5, 9.5-20241118
 GitFetch: refs/heads/9
-GitCommit: ae4de0cbc927f1caf1a9d137d8f6cf69455dffe9
+GitCommit: 77b627bf5868945d5ae46e65af84a2de13a7319a
 amd64-Directory: default/amd64/
 arm64v8-Directory: default/arm64/
 ppc64le-Directory: default/ppc64le/
 s390x-Directory: default/s390x/
 Architectures: amd64, arm64v8, ppc64le, s390x
 
-Tags: minimal, 9-minimal, 9.4-minimal, 9.4-minimal-20240530
+Tags: minimal, 9-minimal, 9.5-minimal, 9.5-minimal-20241118
 GitFetch: refs/heads/9
-GitCommit: ae4de0cbc927f1caf1a9d137d8f6cf69455dffe9
+GitCommit: 77b627bf5868945d5ae46e65af84a2de13a7319a
 amd64-Directory: minimal/amd64/
 arm64v8-Directory: minimal/arm64/
 ppc64le-Directory: minimal/ppc64le/

library/alpine

@@ -1,10 +1,10 @@
 Maintainers: Natanael Copa <[email protected]> (@ncopa)
 GitRepo: https://github.com/alpinelinux/docker-alpine.git
 
-Tags: 20240606, edge
+Tags: 20250108, edge
 Architectures: arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x, i386, amd64
 GitFetch: refs/heads/edge
-GitCommit: 75a51b285731679e7c39c2e3c1cae4edcd6851e5
+GitCommit: c1f1de232c970df2285c03050ab3747b8563164f
 arm64v8-Directory: aarch64/
 arm32v6-Directory: armhf/
 arm32v7-Directory: armv7/
@@ -14,10 +14,10 @@ s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: 3.20.1, 3.20, 3, latest
+Tags: 3.21.2, 3.21, 3, latest
 Architectures: arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x, i386, amd64
-GitFetch: refs/heads/v3.20
-GitCommit: d796f6cbd6ffa3aeb21f6e5a783c20b61dba64dd
+GitFetch: refs/heads/v3.21
+GitCommit: 28413e472a7192492de374a257c33d2802ba163d
 arm64v8-Directory: aarch64/
 arm32v6-Directory: armhf/
 arm32v7-Directory: armv7/
@@ -27,22 +27,23 @@ s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: 3.19.2, 3.19
-Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
-GitFetch: refs/heads/v3.19
-GitCommit: 0ea45484ad78078c51350293201cec8650c2f6bf
+Tags: 3.20.5, 3.20
+Architectures: arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x, i386, amd64
+GitFetch: refs/heads/v3.20
+GitCommit: e5b6428f2a04eaf7f6f6c51232c0bfb6062c9bfe
 arm64v8-Directory: aarch64/
 arm32v6-Directory: armhf/
 arm32v7-Directory: armv7/
 ppc64le-Directory: ppc64le/
+riscv64-Directory: riscv64/
 s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: 3.18.7, 3.18
+Tags: 3.19.6, 3.19
 Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
-GitFetch: refs/heads/v3.18
-GitCommit: fb6cd4d1c0fc2b1b73c34a445d120c02c82752cd
+GitFetch: refs/heads/v3.19
+GitCommit: da0e46144e764925f67d80a2315c17208236a2ae
 arm64v8-Directory: aarch64/
 arm32v6-Directory: armhf/
 arm32v7-Directory: armv7/
@@ -51,10 +52,10 @@ s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: 3.17.8, 3.17
+Tags: 3.18.11, 3.18
 Architectures: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
-GitFetch: refs/heads/v3.17
-GitCommit: 7b631cf259b81eec0f59e8f3cccac479c702d2c1
+GitFetch: refs/heads/v3.18
+GitCommit: 4283069ff594a823a2923e4d1aa3980d829f0891
 arm64v8-Directory: aarch64/
 arm32v6-Directory: armhf/
 arm32v7-Directory: armv7/

library/alt

@@ -7,23 +7,24 @@ GitRepo: https://github.com/alt-cloud/docker-brew-alt.git
 Tags: p10, latest
 Architectures: amd64, i386, arm64v8
 GitFetch: refs/heads/p10
-GitCommit: 924b51de1708a3c8b0dd76193a414460ff721c35
+GitCommit: fa2dd8158cb2fae6f6beb1b75ce521a906defdb6
 amd64-Directory: x86_64/
 i386-Directory: i586/
 arm64v8-Directory: aarch64/
 
 Tags: sisyphus
-Architectures: amd64, i386, arm64v8
+Architectures: amd64, i386, arm64v8, riscv64
 GitFetch: refs/heads/sisyphus
-GitCommit: fc69e420b7b8c5b62cd3d8b13562f122ecdcc2d7
+GitCommit: 22fa2c4589ddd9a413c483e03258a8e337dfe195
 amd64-Directory: x86_64/
 arm64v8-Directory: aarch64/
 i386-Directory: i586/
+riscv64-Directory: riscv64/
 
 Tags: p11
 Architectures: amd64, i386, arm64v8
 GitFetch: refs/heads/p11
-GitCommit: 342757f6f3ca8c82bb6a4169ceef071ff3a8a879
+GitCommit: c2d543714938d5ab0d474f584e0b11b527e08943
 amd64-Directory: x86_64/
 arm64v8-Directory: aarch64/
 i386-Directory: i586/