Merge branch 'hotfix-nginx-init' into 'master'

init

See merge request !4

Dockerfile_10005_cn

 FROM nginx:latest
 COPY ./build /var/www/v3
 COPY ./cert /cert
-COPY ./nginx/nginx_10005_cn.conf /etc/nginx/nginx.conf
+COPY ./nginx/nginx_20000_cn.conf /etc/nginx/nginx.conf
 RUN \
   mkdir -p /var/log/nginx && \
   chmod 777 /var/log/nginx  && \
@@ -10,5 +10,5 @@ RUN \
   touch /var/log/nginx/nginx.pid && \
   chmod 777 /var/log/nginx/nginx.pid
 
-EXPOSE 10005
+EXPOSE 20000
 ENTRYPOINT ["nginx","-g","daemon off;"]

Dockerfile_test_10005

 FROM nginx:latest
 COPY ./build /var/www/v3
 COPY ./cert /cert
-COPY ./nginx/nginx_test_10005.conf /etc/nginx/nginx.conf
+COPY ./nginx/nginx_test_20000.conf /etc/nginx/nginx.conf
 RUN \
   mkdir -p /var/log/nginx && \
   chmod 777 /var/log/nginx  && \
@@ -10,5 +10,5 @@ RUN \
   touch /var/log/nginx/nginx.pid && \
   chmod 777 /var/log/nginx/nginx.pid
 
-EXPOSE 10005
+EXPOSE 20000
 ENTRYPOINT ["nginx","-g","daemon off;"]

nginx/nginx_10005_cn.conf → nginx/nginx_20000_cn.conf

@@ -12,7 +12,7 @@ http {
     client_max_body_size 100M;
 	server {
         server_name bkunyun.com www.bkunyun.com;
-		listen 10005 ssl http2;
+		listen 20000 ssl http2;
         ssl_certificate /cert/bkunyun.com.pem;
         ssl_certificate_key /cert/bkunyun.com.key;
         ssl_session_timeout 5m;
@@ -174,6 +174,7 @@ http {
             set $grafana "http://grafana:3000";
             proxy_pass $grafana;
         }
+
         location ^~ /config/ {
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
@@ -183,6 +184,7 @@ http {
             set $config "http://config:6666";
             proxy_pass $config;
         }
+
         location ~ /grafana/(.*) {
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;

nginx/nginx_test_10005.conf → nginx/nginx_test_20000.conf

@@ -12,7 +12,7 @@ http {
     client_max_body_size 100M;
 	#tcp_nopush on;
 	server {
-		listen 10005;
+		listen 20000;
 		root /var/www;
 		index index.html index.htm;
 		resolver 127.0.0.11 valid=10s;