-
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
Update buildpack-deps #18437
Merged
yosifkit
merged 1 commit into
docker-library:master
from
docker-library-bot:buildpack-deps
Feb 12, 2025
Merged
Update buildpack-deps #18437
yosifkit
merged 1 commit into
docker-library:master
from
docker-library-bot:buildpack-deps
Feb 12, 2025
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
Changes: - docker-library/buildpack-deps@ab3ae04: Add Ubuntu Plucky (25.04) - docker-library/buildpack-deps@4f4a759: Merge pull request docker-library/buildpack-deps#164 from infosiftr/canonical-suites - docker-library/buildpack-deps@49631df: Simplify and update `verify-templating.yml` - docker-library/buildpack-deps@ad037d4: Update README - docker-library/buildpack-deps@92d8c61: Merge pull request docker-library/buildpack-deps#165 from infosiftr/jq-IN - docker-library/buildpack-deps@c708f4c: Use jq's `IN()` instead of `index()` - docker-library/buildpack-deps@cc2dc88: Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates
Diff for 79b98fb:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 85b27a5..0230c75 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -91,6 +91,21 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
GitCommit: f24f02bc0fda57d7f0e30b205df4a38114712b0a
Directory: ubuntu/oracular/scm
+Tags: plucky, 25.04
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: ab3ae04e943ecb240a9691dfa1de219b4a3e32a0
+Directory: ubuntu/plucky
+
+Tags: plucky-curl, 25.04-curl
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: ab3ae04e943ecb240a9691dfa1de219b4a3e32a0
+Directory: ubuntu/plucky/curl
+
+Tags: plucky-scm, 25.04-scm
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: ab3ae04e943ecb240a9691dfa1de219b4a3e32a0
+Directory: ubuntu/plucky/scm
+
Tags: sid, unstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
GitCommit: 2b3a8b7d1f8875865034be3bab98ddd737e37d5e
diff --git a/_bashbrew-list b/_bashbrew-list
index e563303..fcbf923 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,6 +10,9 @@ buildpack-deps:24.04-scm
buildpack-deps:24.10
buildpack-deps:24.10-curl
buildpack-deps:24.10-scm
+buildpack-deps:25.04
+buildpack-deps:25.04-curl
+buildpack-deps:25.04-scm
buildpack-deps:bookworm
buildpack-deps:bookworm-curl
buildpack-deps:bookworm-scm
@@ -33,6 +36,9 @@ buildpack-deps:oldstable-scm
buildpack-deps:oracular
buildpack-deps:oracular-curl
buildpack-deps:oracular-scm
+buildpack-deps:plucky
+buildpack-deps:plucky-curl
+buildpack-deps:plucky-scm
buildpack-deps:scm
buildpack-deps:sid
buildpack-deps:sid-curl
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 17f590e..c9283e3 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -6,6 +6,8 @@ buildpack-deps:24.04-curl
buildpack-deps:24.04-scm
buildpack-deps:24.10-curl
buildpack-deps:24.10-scm
+buildpack-deps:25.04-curl
+buildpack-deps:25.04-scm
buildpack-deps:curl
buildpack-deps:oldstable-curl
buildpack-deps:oldstable-scm
@@ -18,6 +20,7 @@ buildpack-deps:20.04
buildpack-deps:22.04
buildpack-deps:24.04
buildpack-deps:24.10
+buildpack-deps:25.04
buildpack-deps:latest
buildpack-deps:oldstable
buildpack-deps:testing
diff --git a/buildpack-deps_24.04-curl/Dockerfile b/buildpack-deps_25.04-curl/Dockerfile
similarity index 94%
copy from buildpack-deps_24.04-curl/Dockerfile
copy to buildpack-deps_25.04-curl/Dockerfile
index 502d25d..d857e14 100644
--- a/buildpack-deps_24.04-curl/Dockerfile
+++ b/buildpack-deps_25.04-curl/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ubuntu:noble
+FROM ubuntu:plucky
RUN set -eux; \
apt-get update; \
diff --git a/buildpack-deps_testing-scm/Dockerfile b/buildpack-deps_25.04-scm/Dockerfile
similarity index 91%
copy from buildpack-deps_testing-scm/Dockerfile
copy to buildpack-deps_25.04-scm/Dockerfile
index b8c3150..feb6140 100644
--- a/buildpack-deps_testing-scm/Dockerfile
+++ b/buildpack-deps_25.04-scm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:trixie-curl
+FROM buildpack-deps:plucky-curl
RUN set -eux; \
apt-get update; \
diff --git a/buildpack-deps_testing/Dockerfile b/buildpack-deps_25.04/Dockerfile
similarity index 96%
copy from buildpack-deps_testing/Dockerfile
copy to buildpack-deps_25.04/Dockerfile
index 8017017..76d0821 100644
--- a/buildpack-deps_testing/Dockerfile
+++ b/buildpack-deps_25.04/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:trixie-scm
+FROM buildpack-deps:plucky-scm
RUN set -ex; \
apt-get update; \ Relevant Maintainers: |
yosifkit
approved these changes
Feb 12, 2025
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.
Changes:
bashbrew
to gather the canonical list of supported suites buildpack-deps#164 from infosiftr/canonical-suitesverify-templating.yml
IN()
instead ofindex()
buildpack-deps#165 from infosiftr/jq-ININ()
instead ofindex()
generate-stackbrew-library.sh
to supportBASHBREW_LIBRARY
for easier cascading updates