Browse Source

feat: 更新 Docker 配置,添加 Nginx 配置文件路径映射,优化 Nginx 配置

pull/67/head
chenjiale 1 month ago
parent
commit
b170196996
  1. 4
      .drone.yml
  2. 6
      scripts/Dockerfile
  3. 16
      scripts/nginx.conf

4
.drone.yml

@ -27,9 +27,11 @@ steps:
- name: dockersock - name: dockersock
path: /var/run/docker.sock path: /var/run/docker.sock
commands: commands:
- mkdir -p /opt/alert-front/conf
- cp scripts/nginx.conf /opt/alert-front/conf/default.conf
- docker stop alert-front || true - docker stop alert-front || true
- docker rm alert-front || true - docker rm alert-front || true
- docker run -d --restart always --name alert-front --network alert-net -p 5000:5000 alert-front:latest - docker run -d --restart always --name alert-front --network alert-net -p 5000:5000 -v /opt/alert-front/conf:/etc/nginx/conf.d:ro alert-front:latest
volumes: volumes:
- name: dockersock - name: dockersock

6
scripts/Dockerfile

@ -23,11 +23,15 @@ FROM nginx:stable-alpine AS production
# 支持 .mjs 类型 # 支持 .mjs 类型
RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf
RUN rm -f /etc/nginx/conf.d/default.conf
# 拷贝构建产物 # 拷贝构建产物
COPY --from=builder /app/dist /usr/share/nginx/html COPY --from=builder /app/dist /usr/share/nginx/html
# 拷贝 nginx 配置 # 拷贝 nginx 配置
COPY --from=builder /app/scripts/nginx.conf /etc/nginx/nginx.conf COPY --from=builder /app/scripts/nginx.conf /etc/nginx/conf.d/default.conf
VOLUME ["/etc/nginx/conf.d"]
EXPOSE 5000 EXPOSE 5000
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]

16
scripts/nginx.conf

@ -1,27 +1,13 @@
worker_processes 1;
events {
worker_connections 1024;
}
http {
include mime.types;
default_type application/octet-stream;
sendfile on;
server { server {
listen 5000; listen 5000;
server_name _; server_name _;
client_max_body_size 20M; client_max_body_size 20M;
# 静态资源和前端页面
location / { location / {
root /usr/share/nginx/html; root /usr/share/nginx/html;
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
index index.html; index index.html;
# CORS
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
@ -33,7 +19,6 @@ http {
} }
} }
# 代理 API 请求到后端容器
location /admin-api/ { location /admin-api/ {
proxy_pass http://alert-backend:48080; proxy_pass http://alert-backend:48080;
proxy_set_header Host $host; proxy_set_header Host $host;
@ -48,4 +33,3 @@ http {
root /usr/share/nginx/html; root /usr/share/nginx/html;
} }
} }
}

Loading…
Cancel
Save