dever 7 years ago
parent
commit
75a3255700

+ 1 - 1
container/conf/db/mariadb/my.conf

@@ -39,7 +39,7 @@ sort_buffer_size = 512K
 net_buffer_length = 8K                                                     
 read_buffer_size = 256K                                                    
 read_rnd_buffer_size = 512K                                                
-myisam_sort_buffer_size = 8M                                               
+myisam_sort_buffer_size = 8M                                              
                                                                            
 # Point the following paths to different dedicated disks                   
 #tmpdir         = /tmp/                                                    

+ 2 - 1
container/conf/web/nginx/conf.d/site.conf

@@ -28,7 +28,8 @@ server {
         # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
 
         # With php-cgi alone:
-        fastcgi_pass web-php7:9000;
+        #fastcgi_pass web-php7:9000;
+        fastcgi_pass onepage-php5:9000;
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;
         fastcgi_index index.php;

+ 12 - 1
container/conf/web/nginx/nginx.conf

@@ -1,4 +1,4 @@
-#user  nginx;
+user  root;
 worker_processes  8;
 daemon off;
 
@@ -25,6 +25,17 @@ http {
     #tcp_nopush     on;
 
     keepalive_timeout  65;
+    fastcgi_connect_timeout 800;
+    fastcgi_send_timeout 800;
+    fastcgi_read_timeout 800;
+    fastcgi_buffer_size 512k;     
+    fastcgi_buffers 32 512k;       
+    fastcgi_busy_buffers_size 2048k;
+    fastcgi_temp_file_write_size 2048k;   
+    client_max_body_size 500m;
+    client_body_buffer_size 2048k; 
+    client_header_buffer_size 2048k;
+    large_client_header_buffers 4 4096k;
 
     #gzip  on;
 

+ 4 - 0
src/docker/build/web/nginx/concat/Dockerfile

@@ -3,6 +3,8 @@ FROM docker.dever.cc/os/alpine:latest
 MAINTAINER Rabin "https://github.com/shemic"
 ENV NGINX_VERSION=1.13.2
 
+COPY nginx.sh /entrypoint/nginx.sh
+
 RUN apk add --no-cache --update git curl pcre-dev openssl-dev gcc g++ make && \
 	curl -O http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
 	tar -zxvf nginx-${NGINX_VERSION}.tar.gz && \
@@ -11,5 +13,7 @@ RUN apk add --no-cache --update git curl pcre-dev openssl-dev gcc g++ make && \
 	cd nginx-${NGINX_VERSION} && \
 	./configure --add-module=/nginx-http-concat --prefix=/var/lib/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --pid-path=/run/nginx/nginx.pid --lock-path=/run/nginx/nginx.lock --http-client-body-temp-path=/var/lib/nginx/tmp/client_body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --user=nginx --group=nginx --with-http_dav_module --with-http_ssl_module --with-http_stub_status_module --with-http_gzip_static_module --with-http_v2_module --with-http_auth_request_module --with-mail --with-mail_ssl_module && \
 	make && make install && \
+	adduser -S nginx && \
+	mkdir -p /var/lib/nginx/tmp && \
 
 	apk del git curl gcc g++ make

+ 2 - 1
src/tool/php.py

@@ -20,7 +20,8 @@ class Php_Action(object):
 		,'swoole' : ['swoole-2.0.10', 'swoole', 'libevent-dev,libaio-dev,libmnl-dev', '']
 		,'mongo' : ['mongodb-1.3.4', 'mongodb', '', '']
 		,'redis' : ['redis-3.1.5RC2', 'redis', '', '']
-		,'memcached' : ['memcached-3.0.4', 'memcached', 'libmemcached-dev,cyrus-sasl-dev', '']
+		,'memcached' : ['memcached-3.0.4', 'memcached', 'curl-dev,libmemcached-dev,cyrus-sasl-dev', '']
+		,'memcached2' : ['memcached-2.2.0', 'memcached', 'curl-dev,libmemcached-dev,cyrus-sasl-dev', '']
 	}
 
 	@classmethod