diff --git a/Jenkinsfile b/Jenkinsfile index 066f96b..47da47c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline{ choice( description: 'EIP环境', name: 'environment', - choices: ['dev1'] + choices: ['saasdev1'] ) choice( @@ -28,7 +28,7 @@ pipeline{ choice( description: '是否下载包', name: 'isDownloadPackage', - choices: ['是','否'] + choices: ['否','是','是1'] ) string( @@ -86,7 +86,7 @@ pipeline{ sh "rm -rf ./dist/*" sh "npm run build" } - sh "docker build -t 10.2.1.24:10242/bpa/kitchenweb:${build_tag} ." + sh "docker build -t 10.2.1.24:10242/bpa/storemanagementweb:${build_tag} ." } } } @@ -105,7 +105,7 @@ pipeline{ sh "docker login -u ${harborUser} -p ${harborPassword} 10.2.1.24:10242" if(params.operation=='develop') { - sh "docker push 10.2.1.24:10242/bpa/kitchenweb:${build_tag}" + sh "docker push 10.2.1.24:10242/bpa/storemanagementweb:${build_tag}" } } } @@ -127,10 +127,10 @@ pipeline{ // /root/eip/web/shell/linux-eipweb.install.sh eipweb ${build_tag} 80 // """ - sh "sed -i 's//${build_tag}/' k8s_kitchenweb.yaml" - sh "sed -i 's//${env.BRANCH_NAME}/' k8s_kitchenweb.yaml" - sh "sed -i 's//${params.environment}/' k8s_kitchenweb.yaml" - sh "kubectl apply -f k8s_kitchenweb.yaml --record" + sh "sed -i 's//${build_tag}/' k8s_storemanagementweb.yaml" + sh "sed -i 's//${env.BRANCH_NAME}/' k8s_storemanagementweb.yaml" + sh "sed -i 's//${params.environment}/' k8s_storemanagementweb.yaml" + sh "kubectl apply -f k8s_storemanagementweb.yaml --record" } diff --git a/k8s_kitchenweb.yaml b/k8s_storemanagementweb.yaml similarity index 77% rename from k8s_kitchenweb.yaml rename to k8s_storemanagementweb.yaml index 0991553..284bdc9 100644 --- a/k8s_kitchenweb.yaml +++ b/k8s_storemanagementweb.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: kitchenweb + name: storemanagementweb namespace: kube- spec: selector: matchLabels: - app: kitchenweb + app: storemanagementweb replicas: 1 template: metadata: labels: - app: kitchenweb + app: storemanagementweb spec: containers: - - image: 10.2.1.24:10242/bpa/kitchenweb: + - image: 10.2.1.24:10242/bpa/storemanagementweb: imagePullPolicy: IfNotPresent - name: kitchenweb + name: storemanagementweb env: - name: branch value: @@ -45,8 +45,8 @@ kind: Service apiVersion: v1 metadata: labels: - app: kitchenweb - name: kitchenweb + app: storemanagementweb + name: storemanagementweb namespace: kube- spec: type: ClusterIP @@ -54,4 +54,4 @@ spec: - port: 80 name: http selector: - app: kitchenweb + app: storemanagementweb