Commit 2e322b17 authored by wentao.suo's avatar wentao.suo

change docker-slave image

parent f493f4d2
...@@ -269,7 +269,7 @@ def getDocketPackageImage(buildType){ ...@@ -269,7 +269,7 @@ def getDocketPackageImage(buildType){
echo "getDocketPackageImage :${buildType}" echo "getDocketPackageImage :${buildType}"
def args = "" def args = ""
def packageImageInfo=[:] def packageImageInfo=[:]
packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041202"
args += "-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles " args += "-v /home/quant_group/qg-dockerfiles:/home/quant_group/qg-dockerfiles "
args += "-v /home/quant_group/config_repository:/home/quant_group/config_repository " args += "-v /home/quant_group/config_repository:/home/quant_group/config_repository "
args += "-v /home/quant_group/package/:/home/quant_group/package/ " args += "-v /home/quant_group/package/:/home/quant_group/package/ "
...@@ -277,33 +277,27 @@ def getDocketPackageImage(buildType){ ...@@ -277,33 +277,27 @@ def getDocketPackageImage(buildType){
case "java": case "java":
args += "-v /root/.m2:/root/.m2 " args += "-v /root/.m2:/root/.m2 "
//packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-slave:2018040302"
packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041201"
packageImageInfo["args"] = args packageImageInfo["args"] = args
break break
case "nodejs": case "nodejs":
args += "-v /root/.npm:/root/.npm:rw " args += "-v /root/.npm:/root/.npm:rw "
args += "-v /root/.cache:/root/.cache:rw " args += "-v /root/.cache:/root/.cache:rw "
args += "-v /root/.node-gyp:/root/.node-gyp:rw " args += "-v /root/.node-gyp:/root/.node-gyp:rw "
//packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-node-slave:2018041102"
packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041201"
packageImageInfo["args"] = args packageImageInfo["args"] = args
break break
case "python": case "python":
packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041201"
packageImageInfo["args"] = "" packageImageInfo["args"] = ""
break break
case "lua-ui": case "lua-ui":
args += "-v /root/.npm:/root/.npm:rw " args += "-v /root/.npm:/root/.npm:rw "
args += "-v /root/.cache:/root/.cache:rw " args += "-v /root/.cache:/root/.cache:rw "
args += "-v /root/.node-gyp:/root/.node-gyp:rw " args += "-v /root/.node-gyp:/root/.node-gyp:rw "
packageImageInfo["args"] = args
//packageImageInfo["image"] = "192.168.4.36/baseimg/jenkins-node-slave:2018041102"
packageImageInfo["image"] = "192.168.4.36/baseimg/docker-jenkins-slave:2018041201"
packageImageInfo["args"] = args
break break
default: default:
echo "" echo ""
_utils() .beautyEcho("未知的buildType: ${buildType}", "info") _utils() .beautyEcho("未知的buildType: ${buildType}", "info")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment