From 880cd88af224fdcd75e603bd1aedcaf9b19d5ac9 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 01:29:37 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfile=5Fscript?= =?UTF-8?q?=5F3.6.2=5Fdata=5Fbind=5Fanxinproject=5Flocal'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfile_script_3.6.2_data_bind_anxinproject_local | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local index 2c834d6..9871ce9 100644 --- a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local +++ b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local @@ -3,10 +3,10 @@ podTemplate { env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" - env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/Inspection.git" + env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/OperationalService.git" stage('Run shell') { - git branch: 'master', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" container('image-builder') { sh''' From 77207d0b3e92be580a6ba49937c53cdf711ed060 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 01:58:16 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'script/3.6.2/data/1?= =?UTF-8?q?=5Fbing=5Fanxinproject=5Flocal/index.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.6.2/data/1_bing_anxinproject_local/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/3.6.2/data/1_bing_anxinproject_local/index.js b/script/3.6.2/data/1_bing_anxinproject_local/index.js index 92c6afa..024ae57 100644 --- a/script/3.6.2/data/1_bing_anxinproject_local/index.js +++ b/script/3.6.2/data/1_bing_anxinproject_local/index.js @@ -7,17 +7,17 @@ try { // ! 这里是安心云 const anxinyunPool = new Pool({ user: 'postgres', - host: '10.8.30.166', - database: 'Anxinyun0726', - password: '123', + host: '10.8.40.210', + database: 'AnxinCloud', + password: 'postgres', port: 5432, }) // 这里是运维平台 const pomsPool = new Pool({ - user: 'postgres', - host: '10.8.30.32', - database: 'poms_231026_backup', - password: '123', + user: 'POMSAdmin', + host: '10.8.40.223', + database: 'pomstest', + password: 'POMSAdmin_123', port: 5432, }) From b87d4ed04b0db0d388b53d9a349dd12de18d48a7 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 02:01:35 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'script/3.6.2/data/1?= =?UTF-8?q?=5Fbing=5Fanxinproject=5Flocal/Dockerfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/3.6.2/data/1_bing_anxinproject_local/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile b/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile index 046f4f8..b571ae6 100644 --- a/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile +++ b/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile @@ -1,6 +1,6 @@ FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 -COPY . /var/app +COPY ./script/3.6.2/data/1_bing_anxinproject_local /var/app WORKDIR /var/app From 38287aa2d3b22365b513e882b675da73084d3188 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 02:04:52 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'script/3.6.2/data/1?= =?UTF-8?q?=5Fbing=5Fanxinproject=5Flocal/Dockerfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/3.6.2/data/1_bing_anxinproject_local/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile b/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile index b571ae6..3758936 100644 --- a/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile +++ b/script/3.6.2/data/1_bing_anxinproject_local/Dockerfile @@ -1,6 +1,6 @@ FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 -COPY ./script/3.6.2/data/1_bing_anxinproject_local /var/app +COPY ./script/3.6.2/data/1_bing_anxinproject_local/ /var/app WORKDIR /var/app From 3a9fa44e09671a2638e74572aa64932f45d2eb2a Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 02:07:14 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfile=5Fscript?= =?UTF-8?q?=5F3.6.2=5Fdata=5Fbind=5Fanxinproject=5Flocal'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfile_script_3.6.2_data_bind_anxinproject_local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local index 9871ce9..4fe78b2 100644 --- a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local +++ b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local @@ -13,7 +13,7 @@ podTemplate { pwd ls -al - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./script/2.0.0/data/1_reset_project_bind_point/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=../script/3.6.2/data/1_bing_anxinproject_local/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' } From 391947461b18c32eb34087d3ca41c1b7259e6ec5 Mon Sep 17 00:00:00 2001 From: iris_cx Date: Tue, 7 Nov 2023 02:08:49 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfile=5Fscript?= =?UTF-8?q?=5F3.6.2=5Fdata=5Fbind=5Fanxinproject=5Flocal'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfile_script_3.6.2_data_bind_anxinproject_local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local index 4fe78b2..ef71537 100644 --- a/jenkinsfile_script_3.6.2_data_bind_anxinproject_local +++ b/jenkinsfile_script_3.6.2_data_bind_anxinproject_local @@ -13,7 +13,7 @@ podTemplate { pwd ls -al - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=../script/3.6.2/data/1_bing_anxinproject_local/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./script/3.6.2/data/1_bing_anxinproject_local/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' }