Skip to content

Commit 87cdd3b

Browse files
filliphfilliph
committed
Update dockerfiles
1 parent 529c8b7 commit 87cdd3b

File tree

9 files changed

+17
-15
lines changed

9 files changed

+17
-15
lines changed

‎app/images/php-fpm-71/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN set -xe; \
1616
libfreetype6-dev \
1717
libjpeg62-turbo-dev \
1818
libpng-dev \
19+
libwebp-dev \
1920
# for mbstring
2021
libonig-dev \
2122
# memchached extension
@@ -48,7 +49,7 @@ RUN set -xe; \
4849
&& docker-php-ext-enable exif \
4950
&& docker-php-ext-enable opcache \
5051
# built in extensions install
51-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
52+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5253
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5354
&& docker-php-ext-install -j$(nproc) \
5455
bcmath \

‎app/images/php-fpm-71/DockerfileXDebug

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN set -xe; \
1616
libfreetype6-dev \
1717
libjpeg62-turbo-dev \
1818
libpng-dev \
19+
libwebp-dev \
1920
# for mbstring
2021
libonig-dev \
2122
# memchached extension
@@ -38,19 +39,17 @@ RUN set -xe; \
3839
wget \
3940
# pecl installs
4041
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
4242
&& pecl install memcached \
4343
&& pecl install redis \
4444
&& pecl install apcu \
4545
# enable pecl installed extentions
46-
&& docker-php-ext-enable xdebug \
4746
&& docker-php-ext-enable memcached \
4847
&& docker-php-ext-enable redis \
4948
&& docker-php-ext-enable apcu \
5049
&& docker-php-ext-enable exif \
5150
&& docker-php-ext-enable opcache \
5251
# built in extensions install
53-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
52+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5453
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5554
&& docker-php-ext-install -j$(nproc) \
5655
bcmath \
@@ -77,9 +76,8 @@ RUN set -xe; \
7776
&& apt-get install -y rsyslog \
7877
# cleanup
7978
&& pecl clear-cache
80-
COPY ./conf/php-fpm-xdebug.conf /usr/local/etc/php-fpm.conf
79+
COPY ./conf/php-fpm.conf /usr/local/etc/php-fpm.conf
8180
COPY ./conf/00-php.ini /usr/local/etc/php/conf.d/00-php.ini
82-
COPY ./conf/10-xdebug.ini /usr/local/etc/php/conf.d/10-xdebug.ini
8381
COPY ./conf/zzzz-override.ini /usr/local/etc/php/conf.d/zzzz-override.ini
8482
COPY ./conf/docker-sendmail.ini /usr/local/etc/php/conf.d/docker-sendmail.ini
8583

‎app/images/php-fpm-72/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN set -xe; \
1616
libfreetype6-dev \
1717
libjpeg62-turbo-dev \
1818
libpng-dev \
19+
libwebp-dev \
1920
# for mbstring
2021
libonig-dev \
2122
# memchached extension
@@ -48,7 +49,7 @@ RUN set -xe; \
4849
&& docker-php-ext-enable exif \
4950
&& docker-php-ext-enable opcache \
5051
# built in extensions install
51-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
52+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5253
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5354
&& docker-php-ext-install -j$(nproc) \
5455
bcmath \

‎app/images/php-fpm-72/DockerfileXDebug

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN set -xe; \
1616
libfreetype6-dev \
1717
libjpeg62-turbo-dev \
1818
libpng-dev \
19+
libwebp-dev \
1920
# for mbstring
2021
libonig-dev \
2122
# memchached extension
@@ -38,7 +39,7 @@ RUN set -xe; \
3839
wget \
3940
# pecl installs
4041
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
42+
&& pecl install xdebug \
4243
&& pecl install memcached \
4344
&& pecl install redis \
4445
&& pecl install apcu \
@@ -50,7 +51,7 @@ RUN set -xe; \
5051
&& docker-php-ext-enable exif \
5152
&& docker-php-ext-enable opcache \
5253
# built in extensions install
53-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
54+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5455
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5556
&& docker-php-ext-install -j$(nproc) \
5657
bcmath \

‎app/images/php-fpm-73/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN set -xe; \
1616
libfreetype6-dev \
1717
libjpeg62-turbo-dev \
1818
libpng-dev \
19+
libwebp-dev \
1920
# for mbstring
2021
libonig-dev \
2122
# memchached extension
@@ -48,7 +49,7 @@ RUN set -xe; \
4849
&& docker-php-ext-enable exif \
4950
&& docker-php-ext-enable opcache \
5051
# built in extensions install
51-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
52+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5253
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5354
&& docker-php-ext-install -j$(nproc) \
5455
bcmath \

‎app/images/php-fpm-73/DockerfileXDebug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe; \
3838
wget \
3939
# pecl installs
4040
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
41+
&& pecl install xdebug \
4242
&& pecl install memcached \
4343
&& pecl install redis \
4444
&& pecl install apcu \
@@ -50,7 +50,7 @@ RUN set -xe; \
5050
&& docker-php-ext-enable exif \
5151
&& docker-php-ext-enable opcache \
5252
# built in extensions install
53-
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
53+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/ \
5454
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
5555
&& docker-php-ext-install -j$(nproc) \
5656
bcmath \

‎app/images/php-fpm-74/DockerfileXDebug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe; \
3838
wget \
3939
# pecl installs
4040
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
41+
&& pecl install xdebug \
4242
&& pecl install memcached \
4343
&& pecl install redis \
4444
&& pecl install apcu \

‎app/images/php-fpm-80/DockerfileXDebug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe; \
3838
wget \
3939
# pecl installs
4040
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
41+
&& pecl install xdebug \
4242
&& pecl install memcached \
4343
&& pecl install redis \
4444
&& pecl install apcu \

‎app/images/php-fpm-81/DockerfileXDebug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -xe; \
3838
wget \
3939
# pecl installs
4040
&& docker-php-ext-install exif \
41-
&& pecl install xdebug-beta \
41+
&& pecl install xdebug \
4242
&& pecl install memcached \
4343
&& pecl install redis \
4444
&& pecl install apcu \

0 commit comments

Comments
 (0)