From c01b9a9a60eccd5077680c54c1ddeec9688fe1d7 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 29 Aug 2022 14:13:47 +0800
Subject: [PATCH] dockerfile

---
 code/VideoAccess-VCMP/api/Dockerfile | 41 ++++++++++++++++--------
 code/VideoAccess-VCMP/web/Dockerfile | 48 ++++++++++++++++++----------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/code/VideoAccess-VCMP/api/Dockerfile b/code/VideoAccess-VCMP/api/Dockerfile
index 13c1e95..74ac3c3 100644
--- a/code/VideoAccess-VCMP/api/Dockerfile
+++ b/code/VideoAccess-VCMP/api/Dockerfile
@@ -1,21 +1,36 @@
-FROM repository.anxinyun.cn/devops/node:12-dev as builder
+# FROM repository.anxinyun.cn/devops/node:12-dev as builder
 
-COPY . /var/app
+# COPY . /var/app
 
-WORKDIR /var/app
+# WORKDIR /var/app
 
-EXPOSE 8080
+# 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
+
+# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
+
+# COPY --from=builder --chown=node /var/app  /home/node/app
+
+# WORKDIR /home/node/app
 
-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
+# CMD ["node", "server.js"]
 
-FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
 
-COPY --from=builder --chown=node /var/app  /home/node/app
+# 旧版本构建方式
+
+FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
+
+COPY . /var/app
+
+WORKDIR /var/app
+
+EXPOSE 8080
 
-WORKDIR /home/node/app
+CMD ["-u", "http://localhost:8088"]
 
-CMD ["node", "server.js"]
\ No newline at end of file
+ENTRYPOINT [ "node", "server.js" ]
\ No newline at end of file
diff --git a/code/VideoAccess-VCMP/web/Dockerfile b/code/VideoAccess-VCMP/web/Dockerfile
index 9e05d4b..12a6800 100644
--- a/code/VideoAccess-VCMP/web/Dockerfile
+++ b/code/VideoAccess-VCMP/web/Dockerfile
@@ -1,24 +1,40 @@
-FROM repository.anxinyun.cn/devops/node:12-dev as builder
+# FROM repository.anxinyun.cn/devops/node:12-dev as builder
 
-COPY . /var/app
+# COPY . /var/app
 
-WORKDIR /var/app
+# WORKDIR /var/app
 
-EXPOSE 8080
+# 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 npm install --registry http://10.8.30.22:7000
+# RUN npm run build
+# RUN rm  -rf client/src
+# RUN rm  -rf node_modules
+# RUN npm install --production --registry http://10.8.30.22:7000
+
+# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+
+# COPY --from=builder --chown=node /var/app  /home/node/app
+
+# WORKDIR /home/node/app
+
+# CMD ["node", "server.js"]
 
-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 npm install --registry http://10.8.30.22:7000
-RUN npm run build
-RUN rm  -rf client/src
-RUN rm  -rf node_modules
-RUN npm install --production --registry http://10.8.30.22:7000
 
-FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+# 就版本构建方式
 
-COPY --from=builder --chown=node /var/app  /home/node/app
 
-WORKDIR /home/node/app
+FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
+
+COPY . /var/app
+
+WORKDIR /var/app
+
+EXPOSE 8080
+
+CMD ["-u", "http://localhost:8088"]
 
-CMD ["node", "server.js"]
\ No newline at end of file
+ENTRYPOINT [ "node", "server.js" ]
\ No newline at end of file