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 #16815

Merged
merged 1 commit into from
May 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 22, 2024

Changes:

Changes:

- docker-library/buildpack-deps@05b629b: Merge pull request docker-library/buildpack-deps#157 from infosiftr/noble-dist-clean
- docker-library/buildpack-deps@60dc5f9: Update `apt-get dist-clean` logic to include noble
@tianon tianon requested a review from a team as a code owner May 22, 2024 21:14
Copy link

Diff for 46e3422:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6a7fca5..8f3be74 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -93,17 +93,17 @@ Directory: ubuntu/mantic/scm
 
 Tags: noble, 24.04
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
+GitCommit: 60dc5f9555c521de086b2f5770514faf69ee2cc4
 Directory: ubuntu/noble
 
 Tags: noble-curl, 24.04-curl
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f735abb203e08f7317b62c7f48d3e3d6b3d33a04
+GitCommit: 60dc5f9555c521de086b2f5770514faf69ee2cc4
 Directory: ubuntu/noble/curl
 
 Tags: noble-scm, 24.04-scm
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
+GitCommit: 60dc5f9555c521de086b2f5770514faf69ee2cc4
 Directory: ubuntu/noble/scm
 
 Tags: sid, unstable
diff --git a/buildpack-deps_24.04-curl/Dockerfile b/buildpack-deps_24.04-curl/Dockerfile
index 5287cfe..502d25d 100644
--- a/buildpack-deps_24.04-curl/Dockerfile
+++ b/buildpack-deps_24.04-curl/Dockerfile
@@ -18,4 +18,4 @@ RUN set -eux; \
 # https://bugs.debian.org/929417
 		tzdata \
 	; \
-	rm -rf /var/lib/apt/lists/*
+	apt-get dist-clean
diff --git a/buildpack-deps_24.04-scm/Dockerfile b/buildpack-deps_24.04-scm/Dockerfile
index 6fa085c..35fd337 100644
--- a/buildpack-deps_24.04-scm/Dockerfile
+++ b/buildpack-deps_24.04-scm/Dockerfile
@@ -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_24.04/Dockerfile b/buildpack-deps_24.04/Dockerfile
index 4d69db6..ac49db0 100644
--- a/buildpack-deps_24.04/Dockerfile
+++ b/buildpack-deps_24.04/Dockerfile
@@ -51,4 +51,4 @@ RUN set -ex; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*
+	apt-get dist-clean

Relevant Maintainers:

@yosifkit yosifkit merged commit e2499c1 into docker-library:master May 22, 2024
14 checks passed
@yosifkit yosifkit deleted the buildpack-deps branch May 22, 2024 22:20
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