yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit fce6900b1eec424d7f72737faf298399d4afd792 1 parent 25e19a51

add dockerment

Inline Side-by-side
Showing 2 changed files with 12 additions and 11 deletions
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment=""> 4 <list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" />
6 </list> 7 </list>
7 <ignored path="$PROJECT_DIR$/out/" /> 8 <ignored path="$PROJECT_DIR$/out/" />
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,8 +22,8 @@ @@ -21,8 +22,8 @@
21 <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true"> 22 <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
22 <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> 23 <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
23 <provider selected="true" editor-type-id="text-editor"> 24 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="351">  
25 - <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" /> 25 + <state relative-caret-position="104">
  26 + <caret line="33" column="59" lean-forward="false" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
26 <folding /> 27 <folding />
27 </state> 28 </state>
28 </provider> 29 </provider>
@@ -653,12 +654,12 @@ @@ -653,12 +654,12 @@
653 <workItem from="1545965888175" duration="20585000" /> 654 <workItem from="1545965888175" duration="20585000" />
654 <workItem from="1546047561789" duration="16674000" /> 655 <workItem from="1546047561789" duration="16674000" />
655 <workItem from="1546394046618" duration="10116000" /> 656 <workItem from="1546394046618" duration="10116000" />
656 - <workItem from="1546479910588" duration="13641000" /> 657 + <workItem from="1546479910588" duration="13791000" />
657 </task> 658 </task>
658 <servers /> 659 <servers />
659 </component> 660 </component>
660 <component name="TimeTrackingManager"> 661 <component name="TimeTrackingManager">
661 - <option name="totallyTimeSpent" value="74132000" /> 662 + <option name="totallyTimeSpent" value="74282000" />
662 </component> 663 </component>
663 <component name="ToolWindowManager"> 664 <component name="ToolWindowManager">
664 <frame x="-8" y="-8" width="1382" height="744" extended-state="0" /> 665 <frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
@@ -1069,8 +1070,8 @@ @@ -1069,8 +1070,8 @@
1069 </entry> 1070 </entry>
1070 <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> 1071 <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
1071 <provider selected="true" editor-type-id="text-editor"> 1072 <provider selected="true" editor-type-id="text-editor">
1072 - <state relative-caret-position="351">  
1073 - <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" /> 1073 + <state relative-caret-position="104">
  1074 + <caret line="33" column="59" lean-forward="false" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
1074 <folding /> 1075 <folding />
1075 </state> 1076 </state>
1076 </provider> 1077 </provider>
@@ -31,7 +31,7 @@ pipeline { @@ -31,7 +31,7 @@ pipeline {
31 stage('Define para && clean workdir'){ 31 stage('Define para && clean workdir'){
32 steps{ 32 steps{
33 script { 33 script {
34 - def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}" 34 + def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
35 echo "print the para projectName is : ${params.projectName}......" 35 echo "print the para projectName is : ${params.projectName}......"
36 echo "print the para workdir is : ${PROJECT_WORK_DIR}......" 36 echo "print the para workdir is : ${PROJECT_WORK_DIR}......"
37 echo "print the para projectGitGroup is : ${params.projectGitGroup}......" 37 echo "print the para projectGitGroup is : ${params.projectGitGroup}......"
@@ -51,7 +51,7 @@ pipeline { @@ -51,7 +51,7 @@ pipeline {
51 stage('git clone project'){ 51 stage('git clone project'){
52 steps{ 52 steps{
53 script { 53 script {
54 - def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}" 54 + def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
55 sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}" 55 sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
56 } 56 }
57 } 57 }
@@ -61,7 +61,7 @@ pipeline { @@ -61,7 +61,7 @@ pipeline {
61 stage('build project'){ 61 stage('build project'){
62 steps{ 62 steps{
63 script { 63 script {
64 - def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}" 64 + def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
65 sh "cd ${PROJECT_WORK_DIR} && sh ${PROJECT_WORK_DIR}/docker.sh ${params.isNeedCdn} ${PROJECT_WORK_DIR}" 65 sh "cd ${PROJECT_WORK_DIR} && sh ${PROJECT_WORK_DIR}/docker.sh ${params.isNeedCdn} ${PROJECT_WORK_DIR}"
66 } 66 }
67 } 67 }
@@ -71,7 +71,7 @@ pipeline { @@ -71,7 +71,7 @@ pipeline {
71 stage('upload to CDN and nfs'){ 71 stage('upload to CDN and nfs'){
72 steps{ 72 steps{
73 script { 73 script {
74 - def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}" 74 + def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
75 println "begin upload to cdn" 75 println "begin upload to cdn"
76 if(params.isNeedCdn=='YES'){ 76 if(params.isNeedCdn=='YES'){
77 def olddir = "this_is_replace_for_qshell_upload_to_cdn" 77 def olddir = "this_is_replace_for_qshell_upload_to_cdn"
@@ -90,7 +90,7 @@ pipeline { @@ -90,7 +90,7 @@ pipeline {
90 stage('build and push images to qcloud') { 90 stage('build and push images to qcloud') {
91 steps { 91 steps {
92 script { 92 script {
93 - def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}" 93 + def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
94 echo "begin bake image......" 94 echo "begin bake image......"
95 def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}" 95 def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}"
96 sh "docker build -t ${qcloudimage} ${PROJECT_WORK_DIR}/dist/node" 96 sh "docker build -t ${qcloudimage} ${PROJECT_WORK_DIR}/dist/node"