From 77df5d7bf21b9203103bb27b1aa6ffb9527a76ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89?=
Date: Tue, 17 Jan 2023 06:39:58 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'web/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/Dockerfile b/web/Dockerfile
index 4d64f93..4e1c447 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -30,10 +30,10 @@ WORKDIR /var/app
EXPOSE 8080
RUN npm config set registry=http://10.8.30.22:7000
-RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
+
RUN npm cache clean -f
-RUN rm -rf package-lock.json
-RUN npm install --registry http://10.8.30.22:7000
+#RUN rm -rf package-lock.json
+RUN npm install --registry http://10.8.30.22:7000 --legacy-peer-deps
RUN npm run build
RUN rm -rf client/src
RUN rm -rf node_modules
From 6f5f10c44dac54d64687c93633cefd5f7a0f348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89?=
Date: Tue, 17 Jan 2023 06:47:22 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'web/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/Dockerfile b/web/Dockerfile
index 4e1c447..d03e122 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -32,7 +32,7 @@ EXPOSE 8080
RUN npm config set registry=http://10.8.30.22:7000
RUN npm cache clean -f
-#RUN rm -rf package-lock.json
+RUN rm -rf package-lock.json
RUN npm install --registry http://10.8.30.22:7000 --legacy-peer-deps
RUN npm run build
RUN rm -rf client/src