Skip to content

Commit 37e8596

Browse files
authored
Merge pull request #2 from devilbox/release-0.2
Sync modules with upstream
2 parents af0277d + d656f62 commit 37e8596

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,32 @@ RUN set -eux \
9797
fi \
9898
\
9999
&& ./configure \
100-
--host="${gnuArch}" \
100+
--build="${gnuArch}" \
101101
--with-config-file-path="$PHP_INI_DIR" \
102102
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
103103
--enable-fpm \
104104
--with-fpm-user=www-data \
105105
--with-fpm-group=www-data \
106106
--disable-cgi \
107+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
108+
--enable-ftp \
109+
# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
110+
--enable-mbstring \
111+
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
107112
--enable-mysqlnd \
108113
--with-mysql \
109114
--with-curl \
110115
--with-openssl=/usr/local/ssl \
111116
--with-readline \
112117
--with-recode \
113118
--with-zlib \
119+
\
120+
#--with-libdir="lib/$debMultiarch" \
121+
\
122+
${PHP_EXTRA_CONFIGURE_ARGS:-} \
123+
\
114124
&& make -j"$(nproc)" \
125+
&& find -type f -name '*.a' -delete \
115126
&& make install \
116127
&& make clean \
117128
\

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,12 @@ modules enabled by default visit: **[devilbox/docker-php-fpm](https://github.com
112112
| ereg ||
113113
| fileinfo ||
114114
| filter ||
115+
| ftp ||
115116
| hash ||
116117
| iconv ||
117118
| json ||
118119
| libxml ||
120+
| mbstring ||
119121
| mysql ||
120122
| mysqlnd ||
121123
| openssl ||

0 commit comments

Comments
 (0)