Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

2 years ago · 039c5f42f5
6 changed files with 75 additions and 3 deletions
--- a/code/VideoAccess-VCMP/api/Dockerfilenew
+++ b/code/VideoAccess-VCMP/api/Dockerfilenew
@ -0,0 +1,13 @@
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
+COPY ./code/VideoAccess-VCMP/api/ /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"]
--- a/code/VideoAccess-VCMP/web/Dockerfilenew
+++ b/code/VideoAccess-VCMP/web/Dockerfilenew
@ -0,0 +1,17 @@
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
+COPY ./code/VideoAccess-VCMP/web/ /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"]
--- a/code/VideoAccess-VCMP/web/client/index.ejs
+++ b/code/VideoAccess-VCMP/web/client/index.ejs
@ -7,8 +7,8 @@
   <!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy"> -->
   <link rel="shortcut icon" href="/assets/images/favicon.ico">
   <script src="/assets/js/jessibuca/jessibuca.js"></script>
-   <script
-      src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>
+   <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"
+      async></script>
 </head>

 <body>
--- a/code/VideoAccess-VCMP/web/client/index.html
+++ b/code/VideoAccess-VCMP/web/client/index.html
@ -10,7 +10,7 @@
    <link rel="shortcut icon" href="/assets/images/favicon.ico">
    <script src="/assets/js/jessibuca/jessibuca.js"></script>
    <script src="/assets/js/flv.min.js"></script>
-    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>
+    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js" async></script>
 </head>

 <body>
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+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/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
+}
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+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}"			
+		}
+	}
+}