Update to PHP 7.4 (#257)

* Update to PHP 7.4
phpmyadmin · Dec 20, 2019 · b696c1f · b696c1f
1 parent 53a7935
commit b696c1f
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 15 deletions.
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM php:7.2-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%
 
 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
@@ -14,10 +14,17 @@ RUN set -ex; \
         libpng-dev \
         libwebp-dev \
         libxpm-dev \
+        libzip-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
     \
     runDeps="$( \
         scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-FROM php:7.2-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%
 
 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
         libpng-dev \
         libwebp-dev \
         libxpm-dev \
+        libzip-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache
+FROM php:7.4-apache
 
 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
         libpng-dev \
         libwebp-dev \
         libxpm-dev \
+        libzip-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 
 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
@@ -14,10 +14,17 @@ RUN set -ex; \
         libpng-dev \
         libwebp-dev \
         libxpm-dev \
+        libzip-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
     \
     runDeps="$( \
         scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 
 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
         libpng-dev \
         libwebp-dev \
         libxpm-dev \
+        libzip-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \