Mark default-libmysqlclient-dev, libmaxminddb-dev as optional

Signed-off-by: You-Sheng Yang <[email protected]>
vicamo · Jun 13, 2024 · 5969ff8 · 5969ff8
1 parent e7d7022
commit 5969ff8
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 20 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -4,10 +4,17 @@ FROM {{ env.owner }}buildpack-deps:{{ env.codename }}-scm
 RUN set -ex; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		$(for pkg in \
+				default-libmysqlclient-dev \
+				libmaxminddb-dev \
+		; do \
+			if apt-cache show "${pkg}" >/dev/null 2>&1; then \
+				echo "${pkg}"; \
+			fi; \
+		done) \
 		autoconf \
 		automake \
 		bzip2 \
-		default-libmysqlclient-dev \
 		dpkg-dev \
 		file \
 		g++ \
@@ -27,7 +34,6 @@ RUN set -ex; \
 		liblzma-dev \
 		libmagickcore-dev \
 		libmagickwand-dev \
-		libmaxminddb-dev \
 		libncurses5-dev \
 		libncursesw5-dev \
 		libpng-dev \

diff --git a/debian/bookworm/Dockerfile b/debian/bookworm/Dockerfile
diff --git a/debian/bullseye/Dockerfile b/debian/bullseye/Dockerfile
diff --git a/debian/buster/Dockerfile b/debian/buster/Dockerfile
diff --git a/debian/sid/Dockerfile b/debian/sid/Dockerfile
diff --git a/debian/trixie/Dockerfile b/debian/trixie/Dockerfile
diff --git a/ubuntu/focal/Dockerfile b/ubuntu/focal/Dockerfile
diff --git a/ubuntu/jammy/Dockerfile b/ubuntu/jammy/Dockerfile
diff --git a/ubuntu/mantic/Dockerfile b/ubuntu/mantic/Dockerfile
diff --git a/ubuntu/noble/Dockerfile b/ubuntu/noble/Dockerfile