Merge pull request #1992 from xiagw/fix-docker-stop

fix docker stop

docker.build.sh

@@ -3,16 +3,28 @@
 set -xe
 
 rm -rf /app
-ln -s /var/www/html /app
+ln -sf /var/www/html /app
+## php setting
 (
     echo "upload_max_filesize=5120M;"
     echo "post_max_size=5120M;"
 ) >>/opt/docker/etc/php/php.ini
 echo "client_max_body_size 5120m;" >/opt/docker/etc/nginx/vhost.common.d/10-general.conf
+
 ## fix nginx warning
 sed -i -e '1d' /opt/docker/etc/nginx/vhost.ssl.conf
 sed -i -e '/443\ default_server/s//443\ default_server\ ssl/' /opt/docker/etc/nginx/vhost.conf
 
+## disable service
+mv /opt/docker/etc/supervisor.d/cron.conf{,.bak}
+mv /opt/docker/etc/supervisor.d/dnsmasq.conf{,.bak}
+# mv /opt/docker/etc/supervisor.d/nginx.conf{,.bak}
+# mv /opt/docker/etc/supervisor.d/php-fpm.conf{,.bak}
+mv /opt/docker/etc/supervisor.d/postfix.conf{,.bak}
+mv /opt/docker/etc/supervisor.d/ssh.conf{,.bak}
+mv /opt/docker/etc/supervisor.d/syslog.conf{,.bak}
+
+## mirror in china
 if [ "$IN_CHINA" = true ] && [ -f /etc/apk/repositories ]; then
     sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories
 fi

docker.run.sh

@@ -2,9 +2,20 @@
 
 set -e
 
+## web site dir
 if [ ! -f "/var/www/html/index.php" ]; then
     \cp -fr /showdoc_data/html/* /var/www/html/
 fi
+## set file mode
+chown -R 1000:1000 /var/www/html/Sqlite /var/www/html/Public/Uploads
+
+_kill() {
+    echo "receive SIGTERM, kill $pids"
+    for pid in $pids; do
+        kill "$pid"
+        wait "$pid"
+    done
+}
 
 ## backup sqlite file every day
 db_file=/var/www/html/Sqlite/showdoc.db.php
@@ -18,18 +29,26 @@ while [ -f $db_file ]; do
     fi
     sleep 50
 done &
+pids="$pids $!"
 
-chmod 777 -R /var/www/
 (
     sleep 3
     cd /showdoc_data/html/server
     php index.php /api/update/dockerUpdateCode
-    chmod 777 -R /var/www/
 )
 (
+    echo "delay 30s start mock..."
     sleep 30
     cd /showdoc_data/mock/
     npm run start
 ) &
+pids="$pids $!"
+
+supervisord -c /opt/docker/etc/supervisor.conf &
+pids="$pids $!"
+
+## 识别中断信号，停止进程
+trap _kill HUP INT QUIT TERM
+
+wait
 
-supervisord