Merge pull request #1 from YanlongMa/dev

php-fpm
yanlongma · Jul 12, 2019 · 748a128 · 748a128
2 parents 6fc4de2 + 7ad1f46
commit 748a128
Show file tree

Hide file tree

Showing 45 changed files with 29 additions and 16,592 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,11 +31,14 @@ services:
         - INSTALL_MEMCACHED_VERSION=${PHP_INSTALL_MEMCACHED_VERSION}
         - INSTALL_SWOOLE=${PHP_INSTALL_SWOOLE}
         - INSTALL_SWOOLE_VERSION=${PHP_INSTALL_SWOOLE_VERSION}
+        - INSTALL_XUNSEARCH=${PHP_INSTALL_XUNSEARCH}
         - INSTALL_COMPOSER=${PHP_INSTALL_COMPOSER}
     ports:
       - 9000:9000
     volumes:
-      - ./php-fpm/conf-${PHP_VERSION}:/usr/local/etc/
+      - ./php-fpm/conf-${PHP_VERSION}/php.ini:/usr/local/etc/php/php.ini
+      - ./php-fpm/conf-${PHP_VERSION}/php-fpm.conf:/usr/local/etc/php-fpm.conf
+      - ./php-fpm/conf-${PHP_VERSION}/php-fpm.d:/usr/local/etc/php-fpm.d
       - ${WEB_ROOT_PATH}:/var/www
 
   mysql:

diff --git a/env-template b/env-template
@@ -37,6 +37,7 @@ PHP_INSTALL_MEMCACHED_VERSION=3.1.2
 PHP_INSTALL_SWOOLE=flase
 PHP_INSTALL_SWOOLE_VERSION=4.2.13
 
+PHP_INSTALL_XUNSEARCH=false
 PHP_INSTALL_COMPOSER=false
 
 

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -110,9 +110,32 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
 
 
 ###########################################################################
-# Composer:
+# PHP Thrid Extensions:
 ###########################################################################
 
+# Thrid Extensions Xunsearch:
+ARG INSTALL_XUNSEARCH=false
+RUN if [ ${INSTALL_XUNSEARCH} = true ]; then \
+    curl 'http://www.xunsearch.com/scws/down/scws-1.2.3.tar.bz2' -o scws.tar.bz2 \
+    && tar xvjf scws.tar.bz2 \
+    && cd scws-1.2.3 \
+    && ./configure --prefix=/usr/local/scws \
+    && make \
+    && make install \
+    && cd phpext \
+    && phpize \
+    && ./configure --with-scws=/usr/local/scws \
+    && make \
+    && make install \
+    && cd ../../ \
+    && rm -rf scws scws-1.2.3.tar.bz2 \
+    && docker-php-ext-enable scws \
+    && echo "scws.default.charset = utf8" >> /usr/local/etc/php/conf.d/docker-php-ext-scws.ini \
+    && echo "scws.default.fpath = /usr/local/scws/etc" >> /usr/local/etc/php/conf.d/docker-php-ext-scws.ini \
+;fi
+
+
+# Composer:
 ARG INSTALL_COMPOSER=false
 RUN if [ ${INSTALL_COMPOSER} = true ]; then \
     curl -sS http://getcomposer.org/installer | php \

diff --git a/php-fpm/conf-5.6/pear.conf b/php-fpm/conf-5.6/pear.conf
diff --git a/php-fpm/conf-5.6/php/php.ini-production → php-fpm/conf-5.6/php.ini b/php-fpm/conf-5.6/php/php.ini-production → php-fpm/conf-5.6/php.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-bcmath.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-bcmath.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-gd.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-gd.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-mcrypt.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-mcrypt.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-mysqli.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-mysqli.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-pdo_mysql.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-pdo_mysql.ini
diff --git a/php-fpm/conf-5.6/php/conf.d/docker-php-ext-sockets.ini b/php-fpm/conf-5.6/php/conf.d/docker-php-ext-sockets.ini