yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 598d867e895735d6cab03c42ad4b1028a2dd98bf 1 parent f35c5aa8

docker images build

Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
... ... @@ -23,7 +23,7 @@
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="9" column="61" lean-forward="true" selection-start-line="9" selection-start-column="61" selection-end-line="9" selection-end-column="61" />
<caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" />
<folding />
</state>
</provider>
... ... @@ -535,12 +535,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="3501000" />
<workItem from="1545890694011" duration="4399000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3501000" />
<option name="totallyTimeSpent" value="4399000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -636,7 +636,7 @@
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="9" column="61" lean-forward="true" selection-start-line="9" selection-start-column="61" selection-end-line="9" selection-end-column="61" />
<caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" />
<folding />
</state>
</provider>
... ...
... ... @@ -23,7 +23,7 @@ pipeline {
options {
//保持构建的最大个数
buildDiscarder(logRotator(numToKeepStr: '50'))
buildDiscarder(logRotator(numToKeepStr: '2'))
}
stages {
... ... @@ -78,8 +78,8 @@ pipeline {
def repalceDir = "${workdir}/public/dist"
println repalceDir
sh "sed -i 's?${olddir}?${repalceDir}?g' ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig"
//sh "/home/soft/qshell qupload 3 ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig"
//sh "cp -r ${repalceDir} /nfs-ops/Data/app/node-ci/data"
sh "/home/soft/qshell qupload 3 ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig"
sh "cp -r ${repalceDir} /nfs-ops/Data/app/node-ci/data"
}else {
println "params.isNeedCdn is not yes,no upload"
}
... ... @@ -106,6 +106,7 @@ pipeline {
if(check_push_aws_images(params.projectName)){
def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}"
def awsimage = "${env.AWS_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}"
sh "docker tag ${qcloudimage} ${awsimage} "
sh "docker push ${awsimage}"
echo "upload images to aws : ${params.projectName}"
... ...