dever 4 years ago
parent
commit
73206e0871

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

@@ -40,7 +40,7 @@ server {
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;
         fastcgi_index index.php;
-        fastcgi_param  SCRIPT_FILENAME  $rootdir/$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         #fastcgi_param  PATH_INFO $fastcgi_path_info;
         include fastcgi_params;
     }

+ 0 - 1
container/conf/web/php7/conf.d/imagick.ini

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

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

@@ -4,9 +4,9 @@ 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-redis php7-imagick 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 && 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-memcached php7-redis php7-imagick
 
 COPY php.sh /entrypoint/php.sh
 COPY install.sh /install.sh

+ 1 - 1
src/tool/php.py

@@ -24,7 +24,7 @@ class Php_Action(object):
 		,'redis' : ['redis-5.3.2', 'redis', '', '']
 		,'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', '']
-		,'php5_imagick' : ['imagick-3.4.4', 'imagick', 'ImageMagick-dev', 'libtool,imagemagick,imagemagick-dev']
+		,'imagick' : ['imagick-3.4.4', 'imagick', 'ImageMagick-dev', 'libtool,imagemagick,imagemagick-dev', '']
 	}
 
 	@classmethod