Update buildpack-deps #19648
Merged
Update buildpack-deps #19648
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
Member
Author
|
Hold till after the |
This comment has been minimized.
This comment has been minimized.
Member
|
Marking as draft so we can add |
Changes: - docker-library/buildpack-deps@6fbd1fd: Add debian/forky - docker-library/buildpack-deps@b42f7f5: Update debian/trixie - docker-library/buildpack-deps@10b8a6d: Update debian/bullseye - docker-library/buildpack-deps@ba20beb: Update debian/bookworm - docker-library/buildpack-deps@ad1ed32: Merge pull request docker-library/buildpack-deps#169 from infosiftr/no-RVA23 - docker-library/buildpack-deps@a1e0227: Remove riscv64 from Ubuntu 25.10+ (RVA23)
docker-library-bot
force-pushed
the
buildpack-deps
branch
from
9b832fb to
4488182
Compare
Diff for 4488182:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b725e92..e69b2a4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,36 +1,51 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/buildpack-deps.git
-Tags: bookworm, stable, latest
+Tags: bookworm, oldstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bookworm
-Tags: bookworm-curl, stable-curl, curl
+Tags: bookworm-curl, oldstable-curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 3e18c3af1f5dce6a48abf036857f9097b6bd79cc
Directory: debian/bookworm/curl
-Tags: bookworm-scm, stable-scm, scm
+Tags: bookworm-scm, oldstable-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bookworm/scm
-Tags: bullseye, oldstable
+Tags: bullseye, oldoldstable
Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bullseye
-Tags: bullseye-curl, oldstable-curl
+Tags: bullseye-curl, oldoldstable-curl
Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: 93d6db0797f91ab674535553b7e0e762941a02d0
Directory: debian/bullseye/curl
-Tags: bullseye-scm, oldstable-scm
+Tags: bullseye-scm, oldoldstable-scm
Architectures: amd64, arm32v7, arm64v8, i386
GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bullseye/scm
+Tags: forky, testing
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 6fbd1fd6aa17031b10f11a97c31b9da1ac09db76
+Directory: debian/forky
+
+Tags: forky-curl, testing-curl
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 6fbd1fd6aa17031b10f11a97c31b9da1ac09db76
+Directory: debian/forky/curl
+
+Tags: forky-scm, testing-scm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 6fbd1fd6aa17031b10f11a97c31b9da1ac09db76
+Directory: debian/forky/scm
+
Tags: jammy, 22.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
@@ -77,17 +92,17 @@ GitCommit: ab3ae04e943ecb240a9691dfa1de219b4a3e32a0
Directory: ubuntu/plucky/scm
Tags: questing, 25.10
-Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 99e7dc24c50c0a7be371ea9e6aed6134ce4cbfeb
Directory: ubuntu/questing
Tags: questing-curl, 25.10-curl
-Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 99e7dc24c50c0a7be371ea9e6aed6134ce4cbfeb
Directory: ubuntu/questing/curl
Tags: questing-scm, 25.10-scm
-Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 99e7dc24c50c0a7be371ea9e6aed6134ce4cbfeb
Directory: ubuntu/questing/scm
@@ -106,17 +121,17 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv6
GitCommit: 2b3a8b7d1f8875865034be3bab98ddd737e37d5e
Directory: debian/sid/scm
-Tags: trixie, testing
+Tags: trixie, stable, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
Directory: debian/trixie
-Tags: trixie-curl, testing-curl
+Tags: trixie-curl, stable-curl, curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
Directory: debian/trixie/curl
-Tags: trixie-scm, testing-scm
+Tags: trixie-scm, stable-scm, scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 1f4fe499c668d9a2e1578aa8db4f0b2d14482cf5
Directory: debian/trixie/scm
diff --git a/_bashbrew-list b/_bashbrew-list
index d28e145..8400479 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -17,6 +17,9 @@ buildpack-deps:bullseye
buildpack-deps:bullseye-curl
buildpack-deps:bullseye-scm
buildpack-deps:curl
+buildpack-deps:forky
+buildpack-deps:forky-curl
+buildpack-deps:forky-scm
buildpack-deps:jammy
buildpack-deps:jammy-curl
buildpack-deps:jammy-scm
@@ -24,6 +27,9 @@ buildpack-deps:latest
buildpack-deps:noble
buildpack-deps:noble-curl
buildpack-deps:noble-scm
+buildpack-deps:oldoldstable
+buildpack-deps:oldoldstable-curl
+buildpack-deps:oldoldstable-scm
buildpack-deps:oldstable
buildpack-deps:oldstable-curl
buildpack-deps:oldstable-scm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c0d2023..fbc15b2 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -7,6 +7,8 @@ buildpack-deps:25.04-scm
buildpack-deps:25.10-curl
buildpack-deps:25.10-scm
buildpack-deps:curl
+buildpack-deps:oldoldstable-curl
+buildpack-deps:oldoldstable-scm
buildpack-deps:oldstable-curl
buildpack-deps:oldstable-scm
buildpack-deps:scm
@@ -19,6 +21,7 @@ buildpack-deps:24.04
buildpack-deps:25.04
buildpack-deps:25.10
buildpack-deps:latest
+buildpack-deps:oldoldstable
buildpack-deps:oldstable
buildpack-deps:testing
buildpack-deps:unstable
diff --git a/buildpack-deps_curl/Dockerfile b/buildpack-deps_curl/Dockerfile
index 2c61c9e..6b74596 100644
--- a/buildpack-deps_curl/Dockerfile
+++ b/buildpack-deps_curl/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm
+FROM debian:trixie
RUN set -eux; \
apt-get update; \
@@ -16,4 +16,4 @@ RUN set -eux; \
sq \
wget \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
diff --git a/buildpack-deps_latest/Dockerfile b/buildpack-deps_latest/Dockerfile
index 7e95241..8017017 100644
--- a/buildpack-deps_latest/Dockerfile
+++ b/buildpack-deps_latest/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bookworm-scm
+FROM buildpack-deps:trixie-scm
RUN set -ex; \
apt-get update; \
@@ -51,4 +51,4 @@ RUN set -ex; \
xz-utils \
zlib1g-dev \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
diff --git a/buildpack-deps_oldstable-curl/Dockerfile b/buildpack-deps_oldoldstable-curl/Dockerfile
similarity index 100%
copy from buildpack-deps_oldstable-curl/Dockerfile
copy to buildpack-deps_oldoldstable-curl/Dockerfile
diff --git a/buildpack-deps_oldstable-scm/Dockerfile b/buildpack-deps_oldoldstable-scm/Dockerfile
similarity index 100%
copy from buildpack-deps_oldstable-scm/Dockerfile
copy to buildpack-deps_oldoldstable-scm/Dockerfile
diff --git a/buildpack-deps_oldstable/Dockerfile b/buildpack-deps_oldoldstable/Dockerfile
similarity index 100%
copy from buildpack-deps_oldstable/Dockerfile
copy to buildpack-deps_oldoldstable/Dockerfile
diff --git a/buildpack-deps_oldstable-curl/Dockerfile b/buildpack-deps_oldstable-curl/Dockerfile
index 89b916f..2c61c9e 100644
--- a/buildpack-deps_oldstable-curl/Dockerfile
+++ b/buildpack-deps_oldstable-curl/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye
+FROM debian:bookworm
RUN set -eux; \
apt-get update; \
@@ -13,6 +13,7 @@ RUN set -eux; \
curl \
gnupg \
netbase \
+ sq \
wget \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_oldstable-scm/Dockerfile b/buildpack-deps_oldstable-scm/Dockerfile
index 8044a85..6e20276 100644
--- a/buildpack-deps_oldstable-scm/Dockerfile
+++ b/buildpack-deps_oldstable-scm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bullseye-curl
+FROM buildpack-deps:bookworm-curl
RUN set -eux; \
apt-get update; \
diff --git a/buildpack-deps_oldstable/Dockerfile b/buildpack-deps_oldstable/Dockerfile
index 3f92317..7e95241 100644
--- a/buildpack-deps_oldstable/Dockerfile
+++ b/buildpack-deps_oldstable/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bullseye-scm
+FROM buildpack-deps:bookworm-scm
RUN set -ex; \
apt-get update; \
diff --git a/buildpack-deps_scm/Dockerfile b/buildpack-deps_scm/Dockerfile
index 6e20276..b8c3150 100644
--- a/buildpack-deps_scm/Dockerfile
+++ b/buildpack-deps_scm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bookworm-curl
+FROM buildpack-deps:trixie-curl
RUN set -eux; \
apt-get update; \
@@ -17,4 +17,4 @@ RUN set -eux; \
# procps is very common in build systems, and is a reasonably small package
procps \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
diff --git a/buildpack-deps_testing-curl/Dockerfile b/buildpack-deps_testing-curl/Dockerfile
index 6b74596..b9bbec4 100644
--- a/buildpack-deps_testing-curl/Dockerfile
+++ b/buildpack-deps_testing-curl/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:trixie
+FROM debian:forky
RUN set -eux; \
apt-get update; \
diff --git a/buildpack-deps_testing-scm/Dockerfile b/buildpack-deps_testing-scm/Dockerfile
index b8c3150..93a918f 100644
--- a/buildpack-deps_testing-scm/Dockerfile
+++ b/buildpack-deps_testing-scm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:trixie-curl
+FROM buildpack-deps:forky-curl
RUN set -eux; \
apt-get update; \
diff --git a/buildpack-deps_testing/Dockerfile b/buildpack-deps_testing/Dockerfile
index 8017017..8ca201e 100644
--- a/buildpack-deps_testing/Dockerfile
+++ b/buildpack-deps_testing/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:trixie-scm
+FROM buildpack-deps:forky-scm
RUN set -ex; \
apt-get update; \Relevant Maintainers: |
tianon
approved these changes
Aug 12, 2025
Muscraft
pushed a commit
to Muscraft/official-images
that referenced
this pull request
Aug 19, 2025
…pack-deps Update buildpack-deps
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changes: