docker images build

@@ -22,8 +22,8 @@
       <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
       <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
         <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="107" column="24" lean-forward="false" selection-start-line="107" selection-start-column="24" selection-end-line="107" selection-end-column="24" />
+            <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" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -53,6 +53,8 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
+      <find>QA_EMAIL</find>
+      <find>check_push_aws_images</find>
       <find>workdir</find>
       <find>workdir</find>
     </findStrings>
     </findStrings>
   </component>
   </component>
@@ -533,12 +535,12 @@
       <option name="number" value="Default" />
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1545890692513</updated>
       <updated>1545890692513</updated>
-      <workItem from="1545890694011" duration="3156000" />
+      <workItem from="1545890694011" duration="3501000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3156000" />
+    <option name="totallyTimeSpent" value="3501000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -633,8 +635,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
     <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="107" column="24" lean-forward="false" selection-start-line="107" selection-start-column="24" selection-end-line="107" selection-end-column="24" />
+        <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" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

@@ -3,13 +3,13 @@ pipeline {
     agent { label 'master' }
     agent { label 'master' }
 
 
     parameters {
     parameters {
-		string(name:'projectName', defaultValue: 'yohoblk-wap', description: 'GITLAB应用名称')
+		string(name:'projectName', defaultValue: 'yoho-app-web', description: 'GITLAB应用名称')
 		string(name:'projectGitGroup', defaultValue: 'fe', description: 'GITLAB所在的组')
 		string(name:'projectGitGroup', defaultValue: 'fe', description: 'GITLAB所在的组')
-		string(name:'projectBranch', defaultValue: 'feature/docker', description: 'git分支名称')
-		string(name:'deployName', defaultValue: 'node-yohoblk-wap', description: '应用名称')
+		string(name:'projectBranch', defaultValue: 'release/1.0', description: 'git分支名称')
+		string(name:'deployName', defaultValue: 'yoho-app-web', description: '应用名称')
 		string(name:'imageSource', defaultValue: 'yoho-online', description: '镜像存储的仓库')
 		string(name:'imageSource', defaultValue: 'yoho-online', description: '镜像存储的仓库')
-		string(name:'imageVersion', defaultValue: '20180714999', description: '镜像存储的版本')
-		string(name:'isNeedCdn',defaultValue:'NO', description: '是否需要上传CDN')
+		string(name:'imageVersion', defaultValue: 'release-1.0-20181227144324', description: '镜像存储的版本')
+		string(name:'isNeedCdn',defaultValue:'YES', description: '是否需要上传CDN')
     }
     }
 	
 	
 	
 	
@@ -40,7 +40,6 @@ pipeline {
                     echo "print the para imageSource is : ${params.imageSource}......"
                     echo "print the para imageSource is : ${params.imageSource}......"
                     echo "print the para imageVersion is : ${params.imageVersion}......"
                     echo "print the para imageVersion is : ${params.imageVersion}......"
                     def localdir = "${workdir}/docker.sh"
                     def localdir = "${workdir}/docker.sh"
-
                     if(fileExists("$localdir")){
                     if(fileExists("$localdir")){
                         echo "starting delete the dir ${workdir}"
                         echo "starting delete the dir ${workdir}"
                         sh "rm -rf ${workdir}"
                         sh "rm -rf ${workdir}"