dever 2 years ago
parent
commit
90df3640aa

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

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

+ 6 - 6
container/conf/web/nginx/nginx.conf

@@ -5,9 +5,9 @@ daemon off;
 error_log  /var/log/nginx/error.log warn;
 pid        /run/nginx.pid;
 
-
+worker_rlimit_nofile 65535;
 events {
-    worker_connections  2048;
+    worker_connections  65535;
 }
 
 
@@ -24,10 +24,10 @@ http {
     sendfile        off;
     #tcp_nopush     on;
 
-    keepalive_timeout  65;
-    fastcgi_connect_timeout 800;
-    fastcgi_send_timeout 800;
-    fastcgi_read_timeout 800;
+    keepalive_timeout  6500;
+    fastcgi_connect_timeout 8000;
+    fastcgi_send_timeout 8000;
+    fastcgi_read_timeout 8000;
     fastcgi_buffer_size 512k;     
     fastcgi_buffers 32 512k;       
     fastcgi_busy_buffers_size 2048k;

+ 4 - 4
container/conf/web/php7/php-fpm.d/www.conf

@@ -104,22 +104,22 @@ pm = dynamic
 ; forget to tweak pm.* to fit your needs.
 ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
 ; Note: This value is mandatory.
-pm.max_children = 5
+pm.max_children = 50
 
 ; The number of child processes created on startup.
 ; Note: Used only when pm is set to 'dynamic'
 ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = 2
+pm.start_servers = 20
 
 ; The desired minimum number of idle server processes.
 ; Note: Used only when pm is set to 'dynamic'
 ; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
+pm.min_spare_servers = 10
 
 ; The desired maximum number of idle server processes.
 ; Note: Used only when pm is set to 'dynamic'
 ; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
+pm.max_spare_servers = 30
 
 ; The number of seconds after which an idle process will be killed.
 ; Note: Used only when pm is set to 'ondemand'

+ 3 - 3
container/conf/web/php7/php.ini

@@ -380,7 +380,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = 30
+max_execution_time = 300
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -390,7 +390,7 @@ max_execution_time = 30
 ; Development Value: 60 (60 seconds)
 ; Production Value: 60 (60 seconds)
 ; http://php.net/max-input-time
-max_input_time = 60
+max_input_time = 600
 
 ; Maximum input variable nesting level
 ; http://php.net/max-input-nesting-level
@@ -401,7 +401,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = 512M
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;

+ 1 - 1
install

@@ -20,7 +20,7 @@ fi
 mkdir -p /etc/docker
 tee /etc/docker/daemon.json <<-'EOF'
 {
-  "registry-mirrors": ["https://vwypw7yj.mirror.aliyuncs.com"]
+  "registry-mirrors": ["https://b2qcb7w2.mirror.aliyuncs.com"]
   ,"insecure-registries" : ["docker.dever.cc"]
 }
 EOF

+ 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 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
+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 php7-imagick && 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
 

+ 2 - 1
src/docker/build/dev/python/v3/Dockerfile

@@ -6,6 +6,7 @@ RUN apk update && apk add --no-cache bash python3 py-pip && \
 	pip install --upgrade pip && \
 	mkdir /src && \
 	mkdir /root/.pip && \
-	echo -e "[global]\nindex-url = https://pypi.tuna.tsinghua.edu.cn/simple" > /root/.pip/pip.conf
+	echo -e "[global]\nindex-url = https://pypi.douban.com/simple/" > /root/.pip/pip.conf
+	#echo -e "[global]\nindex-url = https://pypi.tuna.tsinghua.edu.cn/simple" > /root/.pip/pip.conf
 
 VOLUME ["/src"]

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

@@ -1,5 +1,5 @@
 #FROM alpine:3.6
-FROM alpine
+FROM alpine:3.17
 
 MAINTAINER Rabin "https://github.com/shemic"
 

+ 1 - 1
src/docker/build/pan/filerun/Dockerfile

@@ -1,5 +1,5 @@
 #FROM jaegerdocker/pan
-FROM afian/filerun
+FROM filerun/filerun
 #FROM afian/filerun:arm32v7
 
 MAINTAINER Rabin "https://github.com/shemic"

+ 5 - 0
src/docker/build/pan/qbit/Dockerfile

@@ -0,0 +1,5 @@
+FROM registry.cn-shenzhen.aliyuncs.com/cnk3x/xunlei:latest
+#离线下载
+#https://github.com/cnk3x/xunlei
+
+MAINTAINER Rabin "https://github.com/shemic"

+ 5 - 0
src/docker/build/pan/xunlei/Dockerfile

@@ -0,0 +1,5 @@
+FROM registry.cn-shenzhen.aliyuncs.com/cnk3x/xunlei:latest
+#离线下载
+#https://github.com/cnk3x/xunlei
+
+MAINTAINER Rabin "https://github.com/shemic"

+ 10 - 0
src/docker/conf/pan.conf

@@ -30,6 +30,16 @@ port = 8000:80,6800:6800
 environment = DOMAIN=:80,ARIA2_USER=rabin,ARIA2_PWD=ilyxddfe521,ENABLE_AUTH=true,RPC_SECRET=dever,PUID=1000,PGID=1000
 volumes = /data/pan/filerun/user-files/down:/data
 
+[xunlei]
+port = 4321:2345
+root = true
+environment = XL_DEBUG=1,XL_BA_USER=rabin,XL_BA_PASSWORD=ilyxddfe521
+volumes = /data/pan/xunlei/data:/xunlei/data,/data/pan/xunlei/downloads:/xunlei/downloads
+
+[qbit]
+port = 8080:8080,6881:6881/tcp,6881:6881/udp
+root = true
+volumes = /data/pan/qbit/down:/downloads
 
 [seafile]
 ;https://cloud.seafile.com/published/seafile-manual-cn/docker/%E7%94%A8Docker%E9%83%A8%E7%BD%B2Seafile.md

+ 3 - 1
src/docker/core.conf

@@ -145,4 +145,6 @@ filerun					= pan/filerun
 nextcloud				= pan/nextcloud
 seafile					= pan/seafile
 plex					= pan/plex
-aria2					= pan/aria2
+aria2					= pan/aria2
+xunlei					= pan/xunlei
+qbit					= pan/qbit