From 1f94cfdd4e6ffdd05d876d53095e1122690a598f Mon Sep 17 00:00:00 2001 From: iris_cx Date: Wed, 28 Jun 2023 07:18:11 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'web/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/Dockerfilenew | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 web/Dockerfilenew diff --git a/web/Dockerfilenew b/web/Dockerfilenew new file mode 100644 index 00000000..e20cf64a --- /dev/null +++ b/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 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 rm -rf package-lock.json +RUN npm install --production --force --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 eb7e61bec2186721426b549be7e33a3a5f89e5f0 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Wed, 28 Jun 2023 07:20:46 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'jenkinsfilenew=5Fweb'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_web | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 jenkinsfilenew_web diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web new file mode 100644 index 00000000..feccdcff --- /dev/null +++ b/jenkinsfilenew_web @@ -0,0 +1,25 @@ +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/Highways4Good.git" + + stage('Run shell') { + git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + + container('image-builder') { + sh''' + pwd + ls -al + + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./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 326611846d6ce6b6e4a8fc26e76598c1de8ac4b9 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Wed, 28 Jun 2023 07:21:48 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'jenkinsfilenew=5Fapi'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 jenkinsfilenew_api diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api new file mode 100644 index 00000000..07c0d1ca --- /dev/null +++ b/jenkinsfilenew_api @@ -0,0 +1,22 @@ +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/Highways4Good.git" + + stage('Run shell') { + git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + + container('image-builder') { + sh''' + find . -depth -name '.svn' -type d -exec rm -rf {} + + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./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 8b37bbd7220b32dfc509f7c4c30c447523afeebd Mon Sep 17 00:00:00 2001 From: iris_cx Date: Wed, 28 Jun 2023 07:22:23 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'api/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/Dockerfilenew | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 api/Dockerfilenew diff --git a/api/Dockerfilenew b/api/Dockerfilenew new file mode 100644 index 00000000..b34d4918 --- /dev/null +++ b/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"] \ No newline at end of file From e5a88f4898e1c46fcd4e60dbd0636c2c837d34eb Mon Sep 17 00:00:00 2001 From: iris_cx Date: Wed, 28 Jun 2023 07:28:09 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'web/Dockerfilenew'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/Dockerfilenew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Dockerfilenew b/web/Dockerfilenew index e20cf64a..b521e017 100644 --- a/web/Dockerfilenew +++ b/web/Dockerfilenew @@ -5,11 +5,11 @@ 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 rm -rf package-lock.json RUN npm install --production --force --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