rabin 2 years ago
parent
commit
252abff43a

+ 1 - 1
container/conf/web/nginx/conf.d/domain.conf

@@ -8,7 +8,7 @@ server {
 
     charset $charset;
 
-    set $rootdir /www/huala/public;
+    set $rootdir /www/wenku-v6-php/public;
     root $rootdir;
     index index.php index.html;
     if (!-d $request_filename){

+ 1 - 1
container/conf/web/php7/conf.d/10_redis.ini

@@ -1 +1 @@
-extension=redis.so
+;extension=redis.so

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

@@ -4,7 +4,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 
 ENV COMPOSER_HOME=/share/lib/php
 
-RUN apk add --no-cache --update curl php7-fpm php7-pear php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-xmlwriter php7-iconv php7-zip php7-phar  php7-openssl php7-dom php7-mbstring php7-simplexml php7-sockets php7-pcntl php7-fileinfo  php7-tokenizer php7-opcache php7-posix && 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 php7-fpm php7-pear php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-xmlwriter php7-iconv php7-zip php7-phar  php7-openssl php7-dom php7-mbstring php7-simplexml php7-sockets php7-pcntl php7-fileinfo  php7-tokenizer php7-opcache php7-posix php7-ctype && 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
 
 #php7-memcached php7-redis php7-imagick
 

+ 1 - 1
src/docker/build/os/alpine/Dockerfile

@@ -7,7 +7,7 @@ ENV CHINA_MIRRORS=http://mirrors.ustc.edu.cn/
 ENV FAU_MIRRORS=http://ftp.fau.de/
 ENV MIRRORS=$CHINA_MIRRORS
 
-RUN sed -i "s/http:\/\/dl-cdn.alpinelinux.org/http:\/\/mirrors.ustc.edu.cn/g" /etc/apk/repositories && apk --no-cache --update add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && date && apk del tzdata && mkdir /entrypoint && mkdir /share
+RUN sed -i "s/https:\/\/dl-cdn.alpinelinux.org/http:\/\/mirrors.ustc.edu.cn/g" /etc/apk/repositories && apk --no-cache --update add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && date && apk del tzdata && mkdir /entrypoint && mkdir /share
 
 VOLUME ["/share"]
 

+ 2 - 1
src/tool/php.py

@@ -25,7 +25,8 @@ class Php_Action(object):
 		,'memcached' : ['memcached-3.0.4', 'memcached', 'curl-dev,libmemcached-dev,cyrus-sasl-dev', '']
 		,'php5_memcached' : ['memcached-2.2.0', 'memcached', 'php5-mysqli,curl-dev,libmemcached-dev,cyrus-sasl-dev', '']
 		#,'imagick' : ['imagick-3.4.4', 'imagick', 'ImageMagick-dev', 'libtool,imagemagick,imagemagick-dev', '']
-		,'imagick' : ['imagick-3.4.4', 'imagick', '', 'libtool,imagemagick,imagemagick-dev', '']
+		#,'imagick' : ['imagick-3.4.4', 'imagick', '', 'libtool,imagemagick,imagemagick-dev', '']
+		,'imagick' : ['imagick-3.4.4', 'imagick', '', 'imagemagick,imagemagick-dev', '']
 	}
 
 	@classmethod