Commit 718f3c83 authored by 智勇's avatar 智勇

修改nodejs打包方式

parent 1364dfcf
...@@ -302,7 +302,7 @@ def checkout_nodejs(systemName, branchName) { ...@@ -302,7 +302,7 @@ def checkout_nodejs(systemName, branchName) {
// sh "chmod +x .git/hooks/post-checkout" // sh "chmod +x .git/hooks/post-checkout"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
} }
sh "npm install" // sh "npm install"
} }
...@@ -409,7 +409,8 @@ def prepare_java(systemName, contextDir) { ...@@ -409,7 +409,8 @@ 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/tke/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 ${contextDir}"
// sh "cp -rf /home/quant_group/qg-dockerfiles/tke/ui/npmrc/common-npmrc /root/.npmrc"
} }
def prepare_luaui(systemName, contextDir) { def prepare_luaui(systemName, contextDir) {
...@@ -551,8 +552,11 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster, ...@@ -551,8 +552,11 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
} }
} }
} else { } else {
if (buildType=='lua-ui'){
def imageCode = docker.build(imageTagCode, "-f ${contextDir}/Code.Dockerfile ${contextDir}") def imageCode = docker.build(imageTagCode, "-f ${contextDir}/Code.Dockerfile ${contextDir}")
imageCode.push() imageCode.push()
}
def image = docker.build(imageTag, "${args} ${contextDir}") def image = docker.build(imageTag, "${args} ${contextDir}")
image.push() image.push()
...@@ -595,7 +599,7 @@ def clean_images(imageTag,imageTagCode,contextDir,buildType) { ...@@ -595,7 +599,7 @@ def clean_images(imageTag,imageTagCode,contextDir,buildType) {
sh "docker rmi -f \$(docker images -q ${imageTag})" sh "docker rmi -f \$(docker images -q ${imageTag})"
} }
}else{ }else{
sh "docker rmi -f \$(docker images -q ${imageTagCode})" // sh "docker rmi -f \$(docker images -q ${imageTagCode})"
sh "docker rmi -f \$(docker images -q ${imageTag})" sh "docker rmi -f \$(docker images -q ${imageTag})"
} }
......
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