docker-php-ext-configure gd - update configure options

bscheshirwork · Dec 25, 2019 · 1aeb99e · 1aeb99e
1 parent 8ac6678
commit 1aeb99e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/yii2-alpine-supervisor-xdebug/Dockerfile b/yii2-alpine-supervisor-xdebug/Dockerfile
@@ -22,10 +22,8 @@ RUN apk --update add \
         nodejs \
         postgresql-dev && \
     docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ && \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure bcmath && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install \

diff --git a/yii2-alpine-supervisor/Dockerfile b/yii2-alpine-supervisor/Dockerfile
@@ -22,10 +22,8 @@ RUN apk --update add \
         nodejs \
         postgresql-dev && \
     docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ && \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure bcmath && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install \

diff --git a/yii2-alpine-xdebug/Dockerfile b/yii2-alpine-xdebug/Dockerfile
@@ -22,10 +22,8 @@ RUN apk --update add \
         nodejs \
         postgresql-dev && \
     docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ && \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure bcmath && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install \

diff --git a/yii2-alpine/Dockerfile b/yii2-alpine/Dockerfile
@@ -22,10 +22,8 @@ RUN apk --update add \
         nodejs \
         postgresql-dev && \
     docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ && \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure bcmath && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install \

diff --git a/yii2-xdebug/Dockerfile b/yii2-xdebug/Dockerfile
@@ -46,7 +46,9 @@ RUN apt-get update && \
     apt-get install -y $mainDependencies \
     --no-install-recommends && \
     docker-php-ext-configure intl && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ && \
+    docker-php-ext-configure gd \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install -j$(nproc) pdo_mysql pdo_pgsql pgsql intl gd zip && \
 # imagick

diff --git a/yii2/Dockerfile b/yii2/Dockerfile
@@ -46,7 +46,9 @@ RUN apt-get update && \
     apt-get install -y $mainDependencies \
     --no-install-recommends && \
     docker-php-ext-configure intl && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ && \
+    docker-php-ext-configure gd \
+        --with-freetype \
+        --with-jpeg && \
     docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \
     docker-php-ext-install -j$(nproc) pdo_mysql pdo_pgsql pgsql intl gd zip && \
 # imagick