Skip to content

Commit 3285efb

Browse files
authored
Merge pull request #3 from devilbox/release-0.3
Sync statically compiled modules with official PHP image
2 parents ee6f3ee + 2e96b6f commit 3285efb

File tree

4 files changed

+54
-10
lines changed

4 files changed

+54
-10
lines changed

Dockerfiles/Dockerfile.jessie

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,26 @@ RUN set -eux \
154154
--with-libdir="/lib/${debMultiarch}/" \
155155
--with-config-file-path="${PHP_INI_DIR}" \
156156
--with-config-file-scan-dir="${PHP_INI_DIR}/conf.d" \
157+
--disable-cgi \
158+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
159+
--enable-ftp \
160+
\
161+
# --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)
162+
--enable-mbstring \
163+
\
164+
# --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)
165+
--enable-mysqlnd \
166+
\
157167
--enable-fpm \
158168
--with-fpm-user=www-data \
159169
--with-fpm-group=www-data \
160-
--disable-cgi \
161-
--enable-mysqlnd \
162-
--with-mysql \
170+
# https://github.com/docker-library/php/issues/439
171+
--with-mhash \
172+
\
173+
# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109)
174+
--with-pdo-sqlite=/usr \
175+
--with-sqlite3=/usr \
176+
\
163177
--with-curl \
164178
--with-openssl=/usr/local/ssl \
165179
--with-readline \

Dockerfiles/Dockerfile.jessie-arm64

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,26 @@ RUN set -eux \
182182
--with-libdir="/lib/${debMultiarch}/" \
183183
--with-config-file-path="${PHP_INI_DIR}" \
184184
--with-config-file-scan-dir="${PHP_INI_DIR}/conf.d" \
185+
--disable-cgi \
186+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
187+
--enable-ftp \
188+
\
189+
# --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)
190+
--enable-mbstring \
191+
\
192+
# --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)
193+
--enable-mysqlnd \
194+
\
185195
--enable-fpm \
186196
--with-fpm-user=www-data \
187197
--with-fpm-group=www-data \
188-
--disable-cgi \
189-
--enable-mysqlnd \
190-
--with-mysql \
198+
# https://github.com/docker-library/php/issues/439
199+
--with-mhash \
200+
\
201+
# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109)
202+
--with-pdo-sqlite=/usr \
203+
--with-sqlite3=/usr \
204+
\
191205
--with-curl \
192206
--with-openssl=/usr/local/ssl \
193207
--with-readline \

Dockerfiles/Dockerfile.stretch

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,26 @@ RUN set -eux \
157157
--with-libdir="/lib/${debMultiarch}/" \
158158
--with-config-file-path="${PHP_INI_DIR}" \
159159
--with-config-file-scan-dir="${PHP_INI_DIR}/conf.d" \
160+
--disable-cgi \
161+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
162+
--enable-ftp \
163+
\
164+
# --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)
165+
--enable-mbstring \
166+
\
167+
# --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)
168+
--enable-mysqlnd \
169+
\
160170
--enable-fpm \
161171
--with-fpm-user=www-data \
162172
--with-fpm-group=www-data \
163-
--disable-cgi \
164-
--enable-mysqlnd \
165-
--with-mysql \
173+
# https://github.com/docker-library/php/issues/439
174+
--with-mhash \
175+
\
176+
# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109)
177+
--with-pdo-sqlite=/usr \
178+
--with-sqlite3=/usr \
179+
\
166180
--with-curl \
167181
--with-openssl=/usr/local/ssl \
168182
--with-readline \

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,13 @@ modules enabled by default visit: **[devilbox/docker-php-fpm](https://github.com
128128
| ereg ||
129129
| fileinfo ||
130130
| filter ||
131+
| ftp ||
131132
| hash ||
132133
| iconv ||
133134
| json ||
134135
| libxml ||
135-
| mysql ||
136+
| mbstring ||
137+
| mhash ||
136138
| mysqlnd ||
137139
| openssl ||
138140
| pcre ||

0 commit comments

Comments
 (0)