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 / {