Sfoglia il codice sorgente

update docker build command

zhoucg 2 anni fa
parent
commit
76a5d64912

+ 1 - 1
message-center-application/Jenkinsfile

@@ -27,7 +27,7 @@ pipeline {
 
 		stage('构建镜像') {
             steps {
-				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg PROJECT_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
+				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg DEPLOY_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
 //                 sh "docker rmi $(docker images -f 'dangling=true' -q)"
                 sh '''docker login -u ${harborUser} --password-stdin < /var/jenkins_home/docker/password ${harborAddr}
 					docker tag ${JOB_NAME}:${TAG} ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG}

+ 3 - 3
wms-application/Jenkinsfile

@@ -7,8 +7,8 @@ pipeline {
 			harborUser='admin'
 			projectGitAddr='http://git.yvanui.com/jztd/wms84.git'
 			projectPath='gateway/wms-gateway'
-      projectPort=8088
-      projectNodePort=30002
+            projectPort=8088
+            projectNodePort=30002
 		}
 
     stages {
@@ -27,7 +27,7 @@ pipeline {
 
 		stage('构建镜像') {
             steps {
-				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg PROJECT_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
+				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg DEPLOY_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
 //                 sh "docker rmi $(docker images -f 'dangling=true' -q)"
                 sh '''docker login -u ${harborUser} --password-stdin < /var/jenkins_home/docker/password ${harborAddr}
 					docker tag ${JOB_NAME}:${TAG} ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG}

+ 1 - 1
wms-gateway/Jenkinsfile

@@ -27,7 +27,7 @@ pipeline {
 
 		stage('构建镜像') {
             steps {
-				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg PROJECT_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
+				sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg DEPLOY_ENV=${ENV} -t ${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
 //                 sh "docker rmi $(docker images -f 'dangling=true' -q)"
                 sh '''docker login -u ${harborUser} --password-stdin < /var/jenkins_home/docker/password ${harborAddr}
 					docker tag ${JOB_NAME}:${TAG} ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG}