Update buildpack-deps #16064
Merged
Update buildpack-deps #16064
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@803a857: Merge pull request docker-library/buildpack-deps#154 from infosiftr/apt-get-dist-clean - docker-library/buildpack-deps@2b3a8b7: Switch to new `apt-get dist-clean` command - docker-library/buildpack-deps@bea86ea: Merge pull request docker-library/buildpack-deps#153 from infosiftr/cleanup - docker-library/buildpack-deps@d0ecd4b: Cleanup comments and remove unnecessary conditional - docker-library/buildpack-deps@c6324a9: Update GHA YAML with bashbrew example improvements (esp. concurrency:)
Diff for d6c7c65:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 69fe66a..08dd1b4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/buildpack-deps.git
Tags: bookworm, stable, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 84e7e46026131a108a6480e5ed2969e8acf2d4e2
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bookworm
Tags: bookworm-curl, stable-curl, curl
@@ -13,12 +13,12 @@ Directory: debian/bookworm/curl
Tags: bookworm-scm, stable-scm, scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 84e7e46026131a108a6480e5ed2969e8acf2d4e2
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bookworm/scm
Tags: bullseye, oldstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bullseye
Tags: bullseye-curl, oldstable-curl
@@ -28,12 +28,12 @@ Directory: debian/bullseye/curl
Tags: bullseye-scm, oldstable-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/bullseye/scm
Tags: buster, oldoldstable
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/buster
Tags: buster-curl, oldoldstable-curl
@@ -43,12 +43,12 @@ Directory: debian/buster/curl
Tags: buster-scm, oldoldstable-scm
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/buster/scm
Tags: focal, 20.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 98a5ab81d47a106c458cdf90733df0ee8beea06c
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/focal
Tags: focal-curl, 20.04-curl
@@ -58,12 +58,12 @@ Directory: ubuntu/focal/curl
Tags: focal-scm, 20.04-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/focal/scm
Tags: jammy, 22.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e2fc735283ba4e96efc3e4acf2b74bc3eccbf327
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/jammy
Tags: jammy-curl, 22.04-curl
@@ -73,12 +73,12 @@ Directory: ubuntu/jammy/curl
Tags: jammy-scm, 22.04-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e2fc735283ba4e96efc3e4acf2b74bc3eccbf327
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/jammy/scm
Tags: lunar, 23.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 31e15bc4a2352c20998e5da6bd8aaa727fd19d06
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/lunar
Tags: lunar-curl, 23.04-curl
@@ -88,12 +88,12 @@ Directory: ubuntu/lunar/curl
Tags: lunar-scm, 23.04-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 31e15bc4a2352c20998e5da6bd8aaa727fd19d06
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/lunar/scm
Tags: mantic, 23.10
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ba367c3a52946cee45274b62f7f8b27e07807289
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/mantic
Tags: mantic-curl, 23.10-curl
@@ -103,12 +103,12 @@ Directory: ubuntu/mantic/curl
Tags: mantic-scm, 23.10-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ba367c3a52946cee45274b62f7f8b27e07807289
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/mantic/scm
Tags: noble, 24.04
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f735abb203e08f7317b62c7f48d3e3d6b3d33a04
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/noble
Tags: noble-curl, 24.04-curl
@@ -118,27 +118,27 @@ Directory: ubuntu/noble/curl
Tags: noble-scm, 24.04-scm
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f735abb203e08f7317b62c7f48d3e3d6b3d33a04
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: ubuntu/noble/scm
Tags: sid, unstable
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: 2b3a8b7d1f8875865034be3bab98ddd737e37d5e
Directory: debian/sid
Tags: sid-curl, unstable-curl
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
-GitCommit: 3e18c3af1f5dce6a48abf036857f9097b6bd79cc
+GitCommit: 2b3a8b7d1f8875865034be3bab98ddd737e37d5e
Directory: debian/sid/curl
Tags: sid-scm, unstable-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
-GitCommit: 65d69325ad741cea6dee20781c1faaab2e003d87
+GitCommit: 2b3a8b7d1f8875865034be3bab98ddd737e37d5e
Directory: debian/sid/scm
Tags: trixie, testing
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 443a8d3c6e53dbd17c55070de7de850f865ba6eb
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/trixie
Tags: trixie-curl, testing-curl
@@ -148,5 +148,5 @@ Directory: debian/trixie/curl
Tags: trixie-scm, testing-scm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 443a8d3c6e53dbd17c55070de7de850f865ba6eb
+GitCommit: d0ecd4b7313e9bc6b00d9a4fe62ad5787bc197ae
Directory: debian/trixie/scm
diff --git a/buildpack-deps_20.04-scm/Dockerfile b/buildpack-deps_20.04-scm/Dockerfile
index 42d5952..9c0de0d 100644
--- a/buildpack-deps_20.04-scm/Dockerfile
+++ b/buildpack-deps_20.04-scm/Dockerfile
@@ -6,13 +6,16 @@
FROM buildpack-deps:focal-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
bzr \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_20.04/Dockerfile b/buildpack-deps_20.04/Dockerfile
index 31e2b4a..32043a5 100644
--- a/buildpack-deps_20.04/Dockerfile
+++ b/buildpack-deps_20.04/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_22.04-scm/Dockerfile b/buildpack-deps_22.04-scm/Dockerfile
index e1fc324..ce12057 100644
--- a/buildpack-deps_22.04-scm/Dockerfile
+++ b/buildpack-deps_22.04-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:jammy-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_22.04/Dockerfile b/buildpack-deps_22.04/Dockerfile
index 7e5f447..d31b7fe 100644
--- a/buildpack-deps_22.04/Dockerfile
+++ b/buildpack-deps_22.04/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_23.04-scm/Dockerfile b/buildpack-deps_23.04-scm/Dockerfile
index 5ba8e8d..6ad7b7e 100644
--- a/buildpack-deps_23.04-scm/Dockerfile
+++ b/buildpack-deps_23.04-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:lunar-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_23.04/Dockerfile b/buildpack-deps_23.04/Dockerfile
index 6e8ad47..5113091 100644
--- a/buildpack-deps_23.04/Dockerfile
+++ b/buildpack-deps_23.04/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_23.10-scm/Dockerfile b/buildpack-deps_23.10-scm/Dockerfile
index 5789291..24d7a22 100644
--- a/buildpack-deps_23.10-scm/Dockerfile
+++ b/buildpack-deps_23.10-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:mantic-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_23.10/Dockerfile b/buildpack-deps_23.10/Dockerfile
index 51df1a8..da7dcef 100644
--- a/buildpack-deps_23.10/Dockerfile
+++ b/buildpack-deps_23.10/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_24.04-scm/Dockerfile b/buildpack-deps_24.04-scm/Dockerfile
index 4b19e70..6fa085c 100644
--- a/buildpack-deps_24.04-scm/Dockerfile
+++ b/buildpack-deps_24.04-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:noble-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_24.04/Dockerfile b/buildpack-deps_24.04/Dockerfile
index 77d82cf..4d69db6 100644
--- a/buildpack-deps_24.04/Dockerfile
+++ b/buildpack-deps_24.04/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_latest/Dockerfile b/buildpack-deps_latest/Dockerfile
index 718d58a..7e95241 100644
--- a/buildpack-deps_latest/Dockerfile
+++ b/buildpack-deps_latest/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_oldoldstable-scm/Dockerfile b/buildpack-deps_oldoldstable-scm/Dockerfile
index 878c5c1..43eccdb 100644
--- a/buildpack-deps_oldoldstable-scm/Dockerfile
+++ b/buildpack-deps_oldoldstable-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:buster-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_oldoldstable/Dockerfile b/buildpack-deps_oldoldstable/Dockerfile
index 7a26fc9..7f6ea0e 100644
--- a/buildpack-deps_oldoldstable/Dockerfile
+++ b/buildpack-deps_oldoldstable/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_oldstable-scm/Dockerfile b/buildpack-deps_oldstable-scm/Dockerfile
index 0710bf2..8044a85 100644
--- a/buildpack-deps_oldstable-scm/Dockerfile
+++ b/buildpack-deps_oldstable-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:bullseye-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_oldstable/Dockerfile b/buildpack-deps_oldstable/Dockerfile
index 61f2105..3f92317 100644
--- a/buildpack-deps_oldstable/Dockerfile
+++ b/buildpack-deps_oldstable/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_scm/Dockerfile b/buildpack-deps_scm/Dockerfile
index cea1525..6e20276 100644
--- a/buildpack-deps_scm/Dockerfile
+++ b/buildpack-deps_scm/Dockerfile
@@ -6,12 +6,15 @@
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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_testing-scm/Dockerfile b/buildpack-deps_testing-scm/Dockerfile
index 0983cce..3f82936 100644
--- a/buildpack-deps_testing-scm/Dockerfile
+++ b/buildpack-deps_testing-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:trixie-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# procps is very common in build systems, and is a reasonably small package
procps \
- && rm -rf /var/lib/apt/lists/*
+ ; \
+ rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_testing/Dockerfile b/buildpack-deps_testing/Dockerfile
index 9af772e..b579eb0 100644
--- a/buildpack-deps_testing/Dockerfile
+++ b/buildpack-deps_testing/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
rm -rf /var/lib/apt/lists/*
diff --git a/buildpack-deps_unstable-curl/Dockerfile b/buildpack-deps_unstable-curl/Dockerfile
index 78b828f..7a3f674 100644
--- a/buildpack-deps_unstable-curl/Dockerfile
+++ b/buildpack-deps_unstable-curl/Dockerfile
@@ -16,4 +16,4 @@ RUN set -eux; \
sq \
wget \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
diff --git a/buildpack-deps_unstable-scm/Dockerfile b/buildpack-deps_unstable-scm/Dockerfile
index 9a512a5..5edf963 100644
--- a/buildpack-deps_unstable-scm/Dockerfile
+++ b/buildpack-deps_unstable-scm/Dockerfile
@@ -6,12 +6,15 @@
FROM buildpack-deps:sid-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 \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
git \
mercurial \
openssh-client \
subversion \
\
+# 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_unstable/Dockerfile b/buildpack-deps_unstable/Dockerfile
index 3728012..2db5438 100644
--- a/buildpack-deps_unstable/Dockerfile
+++ b/buildpack-deps_unstable/Dockerfile
@@ -12,6 +12,7 @@ RUN set -ex; \
autoconf \
automake \
bzip2 \
+ default-libmysqlclient-dev \
dpkg-dev \
file \
g++ \
@@ -49,15 +50,5 @@ RUN set -ex; \
unzip \
xz-utils \
zlib1g-dev \
- \
-# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html
- $( \
-# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep
- if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \
- echo 'default-libmysqlclient-dev'; \
- else \
- echo 'libmysqlclient-dev'; \
- fi \
- ) \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-cleanRelevant Maintainers: |
yosifkit
approved these changes
Jan 16, 2024
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:
apt-get dist-cleancommand buildpack-deps#154 from infosiftr/apt-get-dist-cleanapt-get dist-cleancommand