Commit 3865679b authored by 智勇's avatar 智勇

update

parent aa54c497
...@@ -21,8 +21,8 @@ def contextMkdir(key) { ...@@ -21,8 +21,8 @@ def contextMkdir(key) {
def imageTag(harborGroup,k8sSystemName,safeBranchName,tagName){ def imageTag(harborGroup,k8sSystemName,safeBranchName,tagName){
def imageTag4_4=[:] def imageTag4_4=[:]
imageTag4_4["harborHost"]="http://192.168.4.4" imageTag4_4["harborHost"]="http://192.168.4.4"
imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}" imageTag4_4["imageTag"] = "${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
imageTag4_4["imageTagCode"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}" imageTag4_4["imageTagCode"] = "${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
return [ imageTag4_4 ] return [ imageTag4_4 ]
} }
...@@ -405,7 +405,7 @@ def prepare_java(systemName, contextDir) { ...@@ -405,7 +405,7 @@ def prepare_java(systemName, contextDir) {
def prepare_nodejs(systemName, contextDir) { def prepare_nodejs(systemName, contextDir) {
sh "cp -rf /home/quant_group/qg-dockerfiles/tke/nodejs/* ${contextDir}" sh "cp -rf /home/quant_group/qg-dockerfiles/tke/nodejs/* ${contextDir}"
sh "cp -rf /home/quant_group/config_repository/nodejs/${systemName}.js ${systemName}.env.config" sh "cp -rf /home/quant_group/config_repository/tke/nodejs/${systemName}.js ${systemName}.env.config"
sh "cp -rf /home/quant_group/qg-dockerfiles/tke/ui/npmrc/common-npmrc /root/.npmrc" sh "cp -rf /home/quant_group/qg-dockerfiles/tke/ui/npmrc/common-npmrc /root/.npmrc"
} }
......
...@@ -6,7 +6,7 @@ def call(body) { ...@@ -6,7 +6,7 @@ def call(body) {
ansiColor('xterm') { ansiColor('xterm') {
def harborGroup = "library" // def harborGroup = "library"
def _stage = new org.qg.docker_new.StageBucketTke() def _stage = new org.qg.docker_new.StageBucketTke()
def _utils = new org.qg.docker_new.Utils() def _utils = new org.qg.docker_new.Utils()
...@@ -21,6 +21,7 @@ def call(body) { ...@@ -21,6 +21,7 @@ def call(body) {
def imageType = env.TYPE def imageType = env.TYPE
def buildNumber = env.BUILD_NUMBER def buildNumber = env.BUILD_NUMBER
def cluster = env.CLUSTER def cluster = env.CLUSTER
def harborGroup = env.IMAGE_REPOSITORY
// QG/XXX or QG--QG/systemName--systemName // QG/XXX or QG--QG/systemName--systemName
t = gitRepo.split("/") t = gitRepo.split("/")
......
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