From ba236211936f6d718bb7c78ce46140693fc5d788 Mon Sep 17 00:00:00 2001 From: AaGMixW Date: Fri, 10 Feb 2023 17:35:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:fire:=20=E6=B7=BB=E5=8A=A0=E5=9B=AD?= =?UTF-8?q?=E5=8C=BAweb=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- area-security-web/Dockerfile | 21 +++++++ area-security-web/conf.d/default.conf | 34 ++++++++++ area-security-web/nginx.conf | 89 +++++++++++++++++++++++++++ docker-compose.yml | 17 +++-- 5 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 area-security-web/Dockerfile create mode 100644 area-security-web/conf.d/default.conf create mode 100644 area-security-web/nginx.conf diff --git a/.gitignore b/.gitignore index 3f1dad1..da87bfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ service/*.jar service/data/ -web/html/ +**/html/ images \ No newline at end of file diff --git a/area-security-web/Dockerfile b/area-security-web/Dockerfile new file mode 100644 index 0000000..029fc12 --- /dev/null +++ b/area-security-web/Dockerfile @@ -0,0 +1,21 @@ +# Docker image for web file run +# VERSION 2.0 +# Author: bb + +# 指明当前镜像继承的基础镜像，编译当前镜像时候会自动下载基础镜像(仅第一次打包会下载) +# 基础镜像 +FROM nginx + +LABEL Author="bb, aagmix" +LABEL VERSION="1.0" + +# config +COPY nginx.conf /etc/nginx +COPY conf.d /etc/nginx/conf.d +# 将html里的文件直接复制到nginx的html目录 +COPY html /usr/share/nginx/html + +# 暴露端口 +EXPOSE 3000 + +CMD "nginx" "-g" "daemon off;" \ No newline at end of file diff --git a/area-security-web/conf.d/default.conf b/area-security-web/conf.d/default.conf new file mode 100644 index 0000000..31360ed --- /dev/null +++ b/area-security-web/conf.d/default.conf @@ -0,0 +1,34 @@ +server { + listen 3000; + listen [::]:3000; + server_name localhost; + #charset koi8-r; + #access_log logs/host.access.log main; + location / { + root /usr/share/nginx/html; + index index.html index.htm; + # 开启缓存 + location ~* ^.+\.(ico|gif|jpg|jpeg|png)$ { + access_log off; + expires 2d; + } + location ~* ^.+\.(css|js|txt|xml|swf|wav)$ { + access_log off; + expires 24h; + } + location ~* ^.+\.(html|htm)$ { + expires 1h; + } + location ~* ^.+\.(eot|ttf|otf|woff|svg)$ { + access_log off; + expires max; + } + } + # 后台服务配置，配置了这个location便可以通过访问 + location ^~ /military { + proxy_pass http://military-system:8049/military/; + proxy_set_header Host $host:3000; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} \ No newline at end of file diff --git a/area-security-web/nginx.conf b/area-security-web/nginx.conf new file mode 100644 index 0000000..3103a21 --- /dev/null +++ b/area-security-web/nginx.conf @@ -0,0 +1,89 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + + ## + # Basic Settings + ## + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + + ## + # Logging Settings + ## + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + ## + # Gzip Settings + ## + gzip on; + gzip_min_length 1k; + gzip_comp_level 9; + gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Virtual Host Configs + ## + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} + + +#mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} diff --git a/docker-compose.yml b/docker-compose.yml index 646a270..992397b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,15 +2,22 @@ version: '2' services: military-system: build: service - image: military_system - container_name: military_system + image: military_zgx_system + container_name: military_zgx_system restart: on-failure ports: - 8049:8049 military-web: build: web - image: military_system_web - container_name: military_system_web + image: military_zgx_system_web + container_name: military_zgx_system_web restart: on-failure ports: - - 3001:3001 \ No newline at end of file + - 3001:3001 + area-web: + build: area-security-web + image: military_zgx_area_web + container_name: military_zgx_area_web + restart: on-failure + ports: + - 3000:3000 \ No newline at end of file