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 @@
<component name="ChangeListManager">
<list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -21,8 +22,8 @@
<file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
<state relative-caret-position="104">
<caret line="33" column="59" lean-forward="false" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
<folding />
</state>
</provider>
... ... @@ -653,12 +654,12 @@
<workItem from="1545965888175" duration="20585000" />
<workItem from="1546047561789" duration="16674000" />
<workItem from="1546394046618" duration="10116000" />
<workItem from="1546479910588" duration="13641000" />
<workItem from="1546479910588" duration="13791000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="74132000" />
<option name="totallyTimeSpent" value="74282000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
... ... @@ -1069,8 +1070,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
<state relative-caret-position="104">
<caret line="33" column="59" lean-forward="false" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
<folding />
</state>
</provider>
... ...
... ... @@ -31,7 +31,7 @@ pipeline {
stage('Define para && clean workdir'){
steps{
script {
def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}"
def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
echo "print the para projectName is : ${params.projectName}......"
echo "print the para workdir is : ${PROJECT_WORK_DIR}......"
echo "print the para projectGitGroup is : ${params.projectGitGroup}......"
... ... @@ -51,7 +51,7 @@ pipeline {
stage('git clone project'){
steps{
script {
def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}"
def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
}
}
... ... @@ -61,7 +61,7 @@ pipeline {
stage('build project'){
steps{
script {
def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}"
def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
sh "cd ${PROJECT_WORK_DIR} && sh ${PROJECT_WORK_DIR}/docker.sh ${params.isNeedCdn} ${PROJECT_WORK_DIR}"
}
}
... ... @@ -71,7 +71,7 @@ pipeline {
stage('upload to CDN and nfs'){
steps{
script {
def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}"
def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
println "begin upload to cdn"
if(params.isNeedCdn=='YES'){
def olddir = "this_is_replace_for_qshell_upload_to_cdn"
... ... @@ -90,7 +90,7 @@ pipeline {
stage('build and push images to qcloud') {
steps {
script {
def PROJECT_WORK_DIR="${env.WORKSPACE}"/"${params.projectName}"
def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
echo "begin bake image......"
def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}"
sh "docker build -t ${qcloudimage} ${PROJECT_WORK_DIR}/dist/node"
... ...