Only use some features in higher versions

matyhtf · matyhtf · commit ff63ada1e98f · 2023-05-16T20:43:26.000+08:00
diff --git a/7.2-alpine/Dockerfile b/7.2-alpine/Dockerfile
@@ -39,8 +39,7 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    curl-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -17,8 +17,6 @@ RUN apt install -y \
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
-    unixodbc-dev \
-    odbc-mariadb \
     curl \
     wget \
     zip \
diff --git a/7.3-alpine/Dockerfile b/7.3-alpine/Dockerfile
@@ -39,8 +39,7 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    curl-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -17,8 +17,6 @@ RUN apt install -y \
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
-    unixodbc-dev \
-    odbc-mariadb \
     curl \
     wget \
     zip \
diff --git a/7.4-alpine/Dockerfile b/7.4-alpine/Dockerfile
@@ -39,8 +39,7 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    curl-dev
 
 # extensions
 RUN  docker-php-ext-install \
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -17,8 +17,6 @@ RUN apt install -y \
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
-    unixodbc-dev \
-    odbc-mariadb \
     curl \
     wget \
     zip \
diff --git a/8.0-alpine/Dockerfile b/8.0-alpine/Dockerfile
@@ -39,8 +39,8 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    unixodbc-dev \
+    curl-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/8.1-alpine/Dockerfile b/8.1-alpine/Dockerfile
@@ -39,8 +39,8 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    unixodbc-dev \
+    curl-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/8.2-alpine/Dockerfile b/8.2-alpine/Dockerfile
@@ -39,8 +39,8 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    unixodbc-dev \
+    curl-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -39,8 +39,7 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    curl-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/latest/Dockerfile b/latest/Dockerfile
@@ -17,8 +17,6 @@ RUN apt install -y \
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
-    unixodbc-dev \
-    odbc-mariadb \
     curl \
     wget \
     zip \
diff --git a/rc-alpine/Dockerfile b/rc-alpine/Dockerfile
@@ -39,8 +39,7 @@ RUN apk add --no-cache \
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+    curl-dev
 
 # extensions
 RUN CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install \
diff --git a/rc/Dockerfile b/rc/Dockerfile
@@ -17,8 +17,6 @@ RUN apt install -y \
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
-    unixodbc-dev \
-    odbc-mariadb \
     curl \
     wget \
     zip \
diff --git a/templates/alpine.php b/templates/alpine.php
@@ -40,8 +40,10 @@
     zlib-dev \
     libcurl \
     libpq \
-    curl-dev \
-    unixodbc-dev
+<?php if (version_compare($v, '8.0', '>=')): ?>
+    unixodbc-dev \
+<?php endif; ?>
+    curl-dev
 
 # extensions
 RUN <?=$CFLAGS?> docker-php-ext-install \
diff --git a/templates/debian.php b/templates/debian.php
@@ -18,8 +18,10 @@
     libc-ares-dev \
     libbrotli-dev \
     libpq-dev \
+<?php if (version_compare($v, '8.0', '>=')): ?>
     unixodbc-dev \
     odbc-mariadb \
+<?php endif; ?>
     curl \
     wget \
     zip \
