rabin 7 年之前
父节点
当前提交
a04d770594

+ 0 - 1
container/conf/web/php/conf.d/00_mbstring.ini

@@ -1 +0,0 @@
-extension=mbstring.so

+ 1 - 1
src/docker/build/dev/php/base/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 
 ENV COMPOSER_HOME=/share/lib/php
 
-RUN apk add --no-cache --update curl php5-fpm php5-pear php5-mysql php5-pgsql php5-pdo_mysql php5-pdo_pgsql php5-gd php5-curl php5-mcrypt php5-json php5-zlib php5-xml php5-iconv php5-zip php5-phar php5-memcache php5-openssl php5-dom && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
+RUN apk add --no-cache --update curl php5-fpm php5-pear php5-mysql php5-pgsql php5-pdo_mysql php5-pdo_pgsql php5-gd php5-curl php5-mcrypt php5-json php5-zlib php5-xml php5-iconv php5-zip php5-phar php5-memcache php5-openssl php5-dom php5-mbstring && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
 
 COPY php.sh /entrypoint/php.sh
 COPY install.sh /install.sh

+ 1 - 1
src/docker/build/dev/php/base/install.sh

@@ -4,7 +4,7 @@ lib="php5-dev m4 autoconf gcc g++ make openssl-dev curl"
 apk add --no-cache --update $lib
 if [ -n "$2" ];then
 	rely=$2
-    apk add --no-cache --update ${rely/,/" "}
+    apk add --no-cache --update ${rely//,/" "}
 fi
 curl -O http://pecl.php.net/get/$1.tgz
 tar -xzvf $1.tgz

+ 1 - 1
src/docker/build/dev/php/v7/install.sh

@@ -4,7 +4,7 @@ lib="php7-dev m4 autoconf gcc g++ make openssl-dev curl"
 apk add --no-cache --update $lib
 if [ -n "$2" ];then
 	rely=$2
-    apk add --no-cache --update ${rely/,/" "}
+    apk add --no-cache --update ${rely//,/" "}
 fi
 curl -O http://pecl.php.net/get/$1.tgz
 tar -xzvf $1.tgz