Merge remote-tracking branch 'origin/dev' into dev

build/jenkinsfile_image_app

@@ -1,40 +1,40 @@
 podTemplate {
     node('pod-templ-jenkins-slave-golang') {
-		
+
-		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${LOCAL}/${JOB_NAME}"
+                env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${LOCAL}/${JOB_NAME}"
-		env.IMAGE_NAME_SHORT = "${LOCAL}/${JOB_NAME}"
+                env.IMAGE_NAME_SHORT = "${LOCAL}/${JOB_NAME}"
-		env.CODE_ADDR = "${GIT_ADDRESS}/DevOps/et-go.git"
+                env.CODE_ADDR = "${GIT_ADDRESS}/container/et-go.git"
-		
+
-	    stage('Run shell') { 
+            stage('Run shell') {
-		    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
+                    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
-		    container('golang-builder-1-22') {
+                    container('golang-builder-1-22') {
-				sh'''
+                                sh'''
-				    git version
+                                    git version
-				    git config --global --add url."https://read-only:rEADoNLY7963@gitea.ngaiot.com/".insteadOf "https://gitea.ngaiot.com/"
+                                    git config --global --add url."https://builder:Fs7595!EAT@gitea.anxinyun.cn/".insteadOf "https://gitea.anxinyun.cn/"
-				    unset GOPROXY
+                                    unset GOPROXY
-				    go env -w GOPROXY=https://goproxy.cn,direct
+                                    go env -w GOPROXY=https://goproxy.cn,direct
-				    go env -w GO111MODULE=on
+                                    go env -w GO111MODULE=on
-				    go env -w GOPRIVATE=gitea.ngaiot.com
+                                    go env -w GOPRIVATE=gitea.ngaiot.com,gitea.anxinyun.cn
-				    go env -w GOSUMDB=sum.golang.org
+                                    go env -w GOSUMDB=sum.golang.org
-				    go env
+                                    go env
                     go build  -a -v -o app.exe containerApp/main.go
                     tar -cvf app.tar *.exe *.yaml
-			    '''
+                            '''
-		    }
+                    }
 
-		     container('image-builder') {
+                     container('image-builder') {
-            	sh'''
+                    sh'''
-            		 echo "当前目==="
+                             echo "当前目==="
-            		 pwd
+                             pwd
-            		 ls
+                             ls
-            		 echo "========"
+                             echo "========"
-            		 /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=build/Dockerfile_app --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
+                             /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=build/Dockerfile_app --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup
-            	'''
+                    '''
             }
             archiveArtifacts artifacts: 'app.tar', followSymlinks: false
 
-		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+                    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
-		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+                    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"
-		}
+                }
-	}
+        }
 }