Skip to content

Commit 45cebc5

Browse files
Merge pull request #211 from infosiftr/mbstring
Explicitly enable "mbstring" by default (since certain pecl bits cannot work properly otherwise)
2 parents 58ec1b7 + 386f08a commit 45cebc5

File tree

23 files changed

+46
-0
lines changed

23 files changed

+46
-0
lines changed

5.5/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ RUN set -xe \
6464
--disable-cgi \
6565
# --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)
6666
--enable-mysqlnd \
67+
# --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)
68+
--enable-mbstring \
6769
--with-curl \
6870
--with-libedit \
6971
--with-openssl \

5.5/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ RUN set -xe \
6666
--disable-cgi \
6767
# --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)
6868
--enable-mysqlnd \
69+
# --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)
70+
--enable-mbstring \
6971
--with-curl \
7072
--with-libedit \
7173
--with-openssl \

5.5/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ RUN set -xe \
7777
--disable-cgi \
7878
# --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)
7979
--enable-mysqlnd \
80+
# --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)
81+
--enable-mbstring \
8082
--with-curl \
8183
--with-libedit \
8284
--with-openssl \

5.5/fpm/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

5.5/fpm/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

5.5/zts/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

5.5/zts/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

5.6/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ RUN set -xe \
6464
--disable-cgi \
6565
# --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)
6666
--enable-mysqlnd \
67+
# --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)
68+
--enable-mbstring \
6769
--with-curl \
6870
--with-libedit \
6971
--with-openssl \

5.6/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ RUN set -xe \
6666
--disable-cgi \
6767
# --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)
6868
--enable-mysqlnd \
69+
# --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)
70+
--enable-mbstring \
6971
--with-curl \
7072
--with-libedit \
7173
--with-openssl \

5.6/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ RUN set -xe \
7777
--disable-cgi \
7878
# --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)
7979
--enable-mysqlnd \
80+
# --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)
81+
--enable-mbstring \
8082
--with-curl \
8183
--with-libedit \
8284
--with-openssl \

5.6/fpm/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

5.6/fpm/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

5.6/zts/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

5.6/zts/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

7.0/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ RUN set -xe \
6464
--disable-cgi \
6565
# --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)
6666
--enable-mysqlnd \
67+
# --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)
68+
--enable-mbstring \
6769
--with-curl \
6870
--with-libedit \
6971
--with-openssl \

7.0/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ RUN set -xe \
6666
--disable-cgi \
6767
# --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)
6868
--enable-mysqlnd \
69+
# --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)
70+
--enable-mbstring \
6971
--with-curl \
7072
--with-libedit \
7173
--with-openssl \

7.0/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ RUN set -xe \
7777
--disable-cgi \
7878
# --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)
7979
--enable-mysqlnd \
80+
# --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)
81+
--enable-mbstring \
8082
--with-curl \
8183
--with-libedit \
8284
--with-openssl \

7.0/fpm/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

7.0/fpm/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

7.0/zts/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ RUN set -xe \
6565
--disable-cgi \
6666
# --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)
6767
--enable-mysqlnd \
68+
# --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)
69+
--enable-mbstring \
6870
--with-curl \
6971
--with-libedit \
7072
--with-openssl \

7.0/zts/alpine/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ RUN set -xe \
6767
--disable-cgi \
6868
# --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)
6969
--enable-mysqlnd \
70+
# --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)
71+
--enable-mbstring \
7072
--with-curl \
7173
--with-libedit \
7274
--with-openssl \

Dockerfile-alpine.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ RUN set -xe \
6666
--disable-cgi \
6767
# --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)
6868
--enable-mysqlnd \
69+
# --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)
70+
--enable-mbstring \
6971
--with-curl \
7072
--with-libedit \
7173
--with-openssl \

Dockerfile-debian.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ RUN set -xe \
6464
--disable-cgi \
6565
# --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)
6666
--enable-mysqlnd \
67+
# --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)
68+
--enable-mbstring \
6769
--with-curl \
6870
--with-libedit \
6971
--with-openssl \

0 commit comments

Comments
 (0)