Skip to content
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 #11478

Merged
merged 1 commit into from
Dec 10, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 10, 2021

Changes:

Changes:

- docker-library/buildpack-deps@b8550eb: Adjust "versions.sh" and "apply-templates.sh" to have a bit of helpful output (better matching other repositories)
- docker-library/buildpack-deps@bfa3f8f: Merge pull request docker-library/buildpack-deps#124 from msg7086-forks/master
- docker-library/buildpack-deps@84e7e46: Add Debian Bookworm
@github-actions
Copy link

Diff for 095e5d0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bcb6e26..0bdf849 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,6 +11,16 @@ Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
 Directory: ubuntu/bionic/scm
 
+Tags: bookworm-curl, testing-curl
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 84e7e46026131a108a6480e5ed2969e8acf2d4e2
+Directory: debian/bookworm/curl
+
+Tags: bookworm-scm, testing-scm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 84e7e46026131a108a6480e5ed2969e8acf2d4e2
+Directory: debian/bookworm/scm
+
 Tags: bullseye-curl, stable-curl, curl
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
@@ -96,6 +106,11 @@ Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
 Directory: ubuntu/bionic
 
+Tags: bookworm, testing
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 84e7e46026131a108a6480e5ed2969e8acf2d4e2
+Directory: debian/bookworm
+
 Tags: bullseye, stable, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
diff --git a/_bashbrew-list b/_bashbrew-list
index a774d76..baf1cc4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,6 +16,9 @@ buildpack-deps:21.10-scm
 buildpack-deps:bionic
 buildpack-deps:bionic-curl
 buildpack-deps:bionic-scm
+buildpack-deps:bookworm
+buildpack-deps:bookworm-curl
+buildpack-deps:bookworm-scm
 buildpack-deps:bullseye
 buildpack-deps:bullseye-curl
 buildpack-deps:bullseye-scm
@@ -49,6 +52,9 @@ buildpack-deps:stable-scm
 buildpack-deps:stretch
 buildpack-deps:stretch-curl
 buildpack-deps:stretch-scm
+buildpack-deps:testing
+buildpack-deps:testing-curl
+buildpack-deps:testing-scm
 buildpack-deps:unstable
 buildpack-deps:unstable-curl
 buildpack-deps:unstable-scm
diff --git a/buildpack-deps_unstable-curl/Dockerfile b/buildpack-deps_testing-curl/Dockerfile
similarity index 95%
copy from buildpack-deps_unstable-curl/Dockerfile
copy to buildpack-deps_testing-curl/Dockerfile
index 69fda1d..566db18 100644
--- a/buildpack-deps_unstable-curl/Dockerfile
+++ b/buildpack-deps_testing-curl/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:sid
+FROM debian:bookworm
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/buildpack-deps_21.10-scm/Dockerfile b/buildpack-deps_testing-scm/Dockerfile
similarity index 91%
copy from buildpack-deps_21.10-scm/Dockerfile
copy to buildpack-deps_testing-scm/Dockerfile
index 9b58b4b..cea1525 100644
--- a/buildpack-deps_21.10-scm/Dockerfile
+++ b/buildpack-deps_testing-scm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:impish-curl
+FROM buildpack-deps:bookworm-curl
 
 # procps is very common in build systems, and is a reasonably small package
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/buildpack-deps_20.04/Dockerfile b/buildpack-deps_testing/Dockerfile
similarity index 97%
copy from buildpack-deps_20.04/Dockerfile
copy to buildpack-deps_testing/Dockerfile
index 31e2b4a..718d58a 100644
--- a/buildpack-deps_20.04/Dockerfile
+++ b/buildpack-deps_testing/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:focal-scm
+FROM buildpack-deps:bookworm-scm
 
 RUN set -ex; \
 	apt-get update; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 8ec1078 into docker-library:master Dec 10, 2021
@yosifkit yosifkit deleted the buildpack-deps branch December 10, 2021 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants