From 1a50e3b67bc686a5d3fcb4126746d7fb4b04a0cb Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 18 May 2020 11:01:43 +0800
Subject: [PATCH] update

Former-commit-id: 37ecc550a76d018d6ab2733a3a3912723ba6f00d
---
 labs/docker/.gitignore            |  1 +
 labs/docker/docker-compose.yml    | 15 ++++++++++++---
 labs/docker/nginx/conf/nginx.conf |  3 +--
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 labs/docker/.gitignore

diff --git a/labs/docker/.gitignore b/labs/docker/.gitignore
new file mode 100644
index 00000000..fbf828d6
--- /dev/null
+++ b/labs/docker/.gitignore
@@ -0,0 +1 @@
+log
\ No newline at end of file
diff --git a/labs/docker/docker-compose.yml b/labs/docker/docker-compose.yml
index 7d4b9367..b1cd6b23 100644
--- a/labs/docker/docker-compose.yml
+++ b/labs/docker/docker-compose.yml
@@ -1,5 +1,6 @@
 #https://docs.docker.com/compose/compose-file/
-version: '3.8'
+version: "3.8"
+
 services: 
     web:
         image: nginx:1.18
@@ -10,5 +11,13 @@ services:
             - ./nginx/conf/edusoa.pem:/etc/nginx/edusoa.pem
             - ./nginx/log:/var/log/nginx
         ports: 
-            - "80:80"
-            - "443:443"
\ No newline at end of file
+            - 80:80
+            - 443:443
+        networks: 
+            default: 
+                ipv4_address: 172.16.0.10
+networks: 
+    default: 
+        ipam: 
+            config: 
+                - subnet: 172.16.0.0/16
\ No newline at end of file
diff --git a/labs/docker/nginx/conf/nginx.conf b/labs/docker/nginx/conf/nginx.conf
index 661e17db..6a8b05f3 100644
--- a/labs/docker/nginx/conf/nginx.conf
+++ b/labs/docker/nginx/conf/nginx.conf
@@ -41,8 +41,7 @@ http {
         ssl_certificate_key  edusoa.key; 
         ssl_session_timeout  5m; 
         ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
-	#启用TLS1.1、TLS1.2要求OpenSSL1.0.1及以上版本，若您的OpenSSL版本低于要求，请使用 ssl_protocols TLSv1;
-	ssl_ciphers  HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM; 
+		ssl_ciphers  HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM; 
         ssl_prefer_server_ciphers   on; 
 
 	location / {