yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 06739c08ec02e5cb3949c51c771289b655d7800a 1 parent 598d867e

docker images build

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
... ... @@ -2,7 +2,6 @@
<project version="4">
<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/" />
... ... @@ -22,8 +21,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="243">
<caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" />
<state relative-caret-position="297">
<caret line="11" column="67" lean-forward="false" selection-start-line="11" selection-start-column="67" selection-end-line="11" selection-end-column="67" />
<folding />
</state>
</provider>
... ... @@ -535,15 +534,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="4399000" />
<workItem from="1545890694011" duration="5728000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4399000" />
<option name="totallyTimeSpent" value="5728000" />
</component>
<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="7" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
... ... @@ -635,8 +634,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" />
<state relative-caret-position="297">
<caret line="11" column="67" lean-forward="false" selection-start-line="11" selection-start-column="67" selection-end-line="11" selection-end-column="67" />
<folding />
</state>
</provider>
... ...
... ... @@ -106,7 +106,8 @@ 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}"
//aws docker login session timeout
sh "$(aws ecr get-login --no-include-email)"
sh "docker tag ${qcloudimage} ${awsimage} "
sh "docker push ${awsimage}"
echo "upload images to aws : ${params.projectName}"
... ... @@ -131,5 +132,6 @@ def check_push_aws_images(project_name){
def lst = [];
lst.add("yohobuywap-node");
lst.add("yohobuy-node");
lst.add("yoho-app-web");
return lst.contains(project_name);
}
... ...