From 18e4088774033ce1da80839d057409813d798bc2 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Mar 2022 16:25:55 +0800
Subject: [PATCH] 冲突

---
 Dockerfile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 41eee30..066ce2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,4 +3,6 @@
 #将dist目录内容复制到nginx容器html内部
 COPY dist /usr/share/nginx/html/
 
+COPY nginx.conf /etc/nginx/nginx.conf
+
 EXPOSE 80
\ No newline at end of file

--
Gitblit v1.9.3