From a107089c79b2cda87c900a66b102ea7510849829 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 10 Jul 2023 14:37:04 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=96=87=E4=BB=B6=20as?= =?UTF-8?q?ync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/web/client/index.ejs | 4 ++-- code/VideoAccess-VCMP/web/client/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/VideoAccess-VCMP/web/client/index.ejs b/code/VideoAccess-VCMP/web/client/index.ejs index 0e4ff01..90951d3 100644 --- a/code/VideoAccess-VCMP/web/client/index.ejs +++ b/code/VideoAccess-VCMP/web/client/index.ejs @@ -7,8 +7,8 @@ - + diff --git a/code/VideoAccess-VCMP/web/client/index.html b/code/VideoAccess-VCMP/web/client/index.html index d7266d3..274f939 100644 --- a/code/VideoAccess-VCMP/web/client/index.html +++ b/code/VideoAccess-VCMP/web/client/index.html @@ -10,7 +10,7 @@ - + From ea54a88f33f5551fae9edaf453456a5a2f1bcaf8 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:04:00 +0000 Subject: [PATCH 02/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'code/VideoAccess-VC?= =?UTF-8?q?MP/web/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/web/Dockerfilenew | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 code/VideoAccess-VCMP/web/Dockerfilenew diff --git a/code/VideoAccess-VCMP/web/Dockerfilenew b/code/VideoAccess-VCMP/web/Dockerfilenew new file mode 100644 index 0000000..5ce0be9 --- /dev/null +++ b/code/VideoAccess-VCMP/web/Dockerfilenew @@ -0,0 +1,17 @@ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder +COPY . /var/app +WORKDIR /var/app +EXPOSE 8080 +RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ +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 https://nexus.ngaiot.com/repository/fs-npm/ +RUN npm run build +RUN rm -rf client/src +RUN rm -rf node_modules +RUN npm install --production --registry https://nexus.ngaiot.com/repository/fs-npm/ +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"] \ No newline at end of file From 960c8cdddfe52da0c16906b6857c105cec9da5fa Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:04:28 +0000 Subject: [PATCH 03/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'code/VideoAccess-VC?= =?UTF-8?q?MP/api/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/Dockerfilenew | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 code/VideoAccess-VCMP/api/Dockerfilenew diff --git a/code/VideoAccess-VCMP/api/Dockerfilenew b/code/VideoAccess-VCMP/api/Dockerfilenew new file mode 100644 index 0000000..a2a9c17 --- /dev/null +++ b/code/VideoAccess-VCMP/api/Dockerfilenew @@ -0,0 +1,13 @@ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder +COPY . /var/app +WORKDIR /var/app +EXPOSE 8080 +RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ +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 https://nexus.ngaiot.com/repository/fs-npm/ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 +COPY --from=builder --chown=node /var/app /home/node/app +WORKDIR /home/node/app +CMD ["node", "server.js"] From 564cac18e48095b472b4e41000b01959587b6a49 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:07:04 +0000 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'jenkinsfilenew=5Fap?= =?UTF-8?q?i'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 jenkinsfilenew_api diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api new file mode 100644 index 0000000..813c387 --- /dev/null +++ b/jenkinsfilenew_api @@ -0,0 +1,20 @@ +podTemplate { + node('pod-templ-jenkins-slave-common') { + + env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" + env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" + env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git" + + stage('Run shell') { + git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + + container('image-builder') { + sh''' + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=.code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + ''' + } + + buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" + buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" + } + } \ No newline at end of file From d487454a84977a2bc62cd7aab9e8d1f1f2003ea7 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:07:36 +0000 Subject: [PATCH 05/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'jenkinsfilenew=5Fwe?= =?UTF-8?q?b'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_web | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 jenkinsfilenew_web diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web new file mode 100644 index 0000000..ecf1289 --- /dev/null +++ b/jenkinsfilenew_web @@ -0,0 +1,20 @@ +podTemplate { + node('pod-templ-jenkins-slave-common') { + + env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" + env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" + env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git" + + stage('Run shell') { + git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + + container('image-builder') { + sh''' + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=.code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + ''' + } + + buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" + buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" + } + } \ No newline at end of file From db56433aa86688ccf72766565c5ef9ca7dcf1bf7 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:07:49 +0000 Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fap?= =?UTF-8?q?i'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index 813c387..02555d7 100644 --- a/jenkinsfilenew_api +++ b/jenkinsfilenew_api @@ -6,7 +6,7 @@ podTemplate { env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/FS-IOT.git" stage('Run shell') { - git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + git branch: 'dev_trial', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" container('image-builder') { sh''' From 6ae1eae8d3d0f3ebc6c4b8b26fdd5939bfe82a9b Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:10:52 +0000 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fap?= =?UTF-8?q?i'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index 02555d7..3deec1f 100644 --- a/jenkinsfilenew_api +++ b/jenkinsfilenew_api @@ -10,7 +10,7 @@ podTemplate { container('image-builder') { sh''' - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=.code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' } From a144e40763834f8f9f3bd86efb961513482632e9 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:11:12 +0000 Subject: [PATCH 08/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fwe?= =?UTF-8?q?b'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web index ecf1289..a721198 100644 --- a/jenkinsfilenew_web +++ b/jenkinsfilenew_web @@ -10,7 +10,7 @@ podTemplate { container('image-builder') { sh''' - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=.code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' } From d3e556b0cd043c9c7c09a5572690a84e9919a4cf Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:15:33 +0000 Subject: [PATCH 09/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fwe?= =?UTF-8?q?b'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_web | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web index a721198..a146728 100644 --- a/jenkinsfilenew_web +++ b/jenkinsfilenew_web @@ -17,4 +17,5 @@ podTemplate { buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" } - } \ No newline at end of file + } +} \ No newline at end of file From 1acb1876f59e91ff5b5625b83e48be7e7f3ad5dc Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:17:10 +0000 Subject: [PATCH 10/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fap?= =?UTF-8?q?i'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index 3deec1f..4cfda67 100644 --- a/jenkinsfilenew_api +++ b/jenkinsfilenew_api @@ -17,4 +17,5 @@ podTemplate { buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" } - } \ No newline at end of file + } +} \ No newline at end of file From 1b1fcb55f25cd3bdb78db752754374412ea1cb8f Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 11 Jul 2023 00:39:03 +0000 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'code/VideoAccess-VC?= =?UTF-8?q?MP/web/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/web/Dockerfilenew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/web/Dockerfilenew b/code/VideoAccess-VCMP/web/Dockerfilenew index 5ce0be9..0307eaa 100644 --- a/code/VideoAccess-VCMP/web/Dockerfilenew +++ b/code/VideoAccess-VCMP/web/Dockerfilenew @@ -1,5 +1,5 @@ FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder -COPY . /var/app +COPY ./code/VideoAccess-VCMP/web/ /var/app WORKDIR /var/app EXPOSE 8080 RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ From 179e691665fa8f1efc5784652259c30ff6eb128f Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 11 Jul 2023 00:41:19 +0000 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'code/VideoAccess-VC?= =?UTF-8?q?MP/api/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/Dockerfilenew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/api/Dockerfilenew b/code/VideoAccess-VCMP/api/Dockerfilenew index a2a9c17..36d624a 100644 --- a/code/VideoAccess-VCMP/api/Dockerfilenew +++ b/code/VideoAccess-VCMP/api/Dockerfilenew @@ -1,5 +1,5 @@ FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder -COPY . /var/app +COPY ./code/VideoAccess-VCMP/api/ /var/app WORKDIR /var/app EXPOSE 8080 RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/