yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 0d2b4099054d8b49c69a7081b37a5109022bdc23 1 parent 787a464e

docker

Inline Side-by-side
Showing 4 changed files with 76 additions and 30 deletions
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <project version="4"> 2 <project version="4">
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" />  
7 <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" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" />
9 </list> 9 </list>
10 <ignored path="$PROJECT_DIR$/out/" /> 10 <ignored path="$PROJECT_DIR$/out/" />
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
41 </provider> 41 </provider>
42 </entry> 42 </entry>
43 </file> 43 </file>
44 - <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="false"> 44 + <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
45 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile"> 45 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
46 <provider selected="true" editor-type-id="text-editor"> 46 <provider selected="true" editor-type-id="text-editor">
47 - <state relative-caret-position="-526">  
48 - <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" /> 47 + <state relative-caret-position="311">
  48 + <caret line="86" column="14" lean-forward="false" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
49 <folding /> 49 <folding />
50 </state> 50 </state>
51 </provider> 51 </provider>
@@ -61,11 +61,11 @@ @@ -61,11 +61,11 @@
61 </provider> 61 </provider>
62 </entry> 62 </entry>
63 </file> 63 </file>
64 - <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true"> 64 + <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="false">
65 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 65 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
66 <provider selected="true" editor-type-id="text-editor"> 66 <provider selected="true" editor-type-id="text-editor">
67 - <state relative-caret-position="54">  
68 - <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> 67 + <state relative-caret-position="-54">
  68 + <caret line="13" column="112" lean-forward="false" selection-start-line="13" selection-start-column="100" selection-end-line="13" selection-end-column="112" />
69 <folding /> 69 <folding />
70 </state> 70 </state>
71 </provider> 71 </provider>
@@ -74,8 +74,8 @@ @@ -74,8 +74,8 @@
74 <file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="false"> 74 <file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="false">
75 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json"> 75 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
76 <provider selected="true" editor-type-id="text-editor"> 76 <provider selected="true" editor-type-id="text-editor">
77 - <state relative-caret-position="248">  
78 - <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" /> 77 + <state relative-caret-position="329">
  78 + <caret line="40" column="79" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="79" />
79 <folding /> 79 <folding />
80 </state> 80 </state>
81 </provider> 81 </provider>
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
110 <find>workdir</find> 110 <find>workdir</find>
111 <find>public</find> 111 <find>public</find>
112 <find>FAMILY</find> 112 <find>FAMILY</find>
  113 + <find>BUILD_VERSION</find>
113 </findStrings> 114 </findStrings>
114 </component> 115 </component>
115 <component name="Git.Settings"> 116 <component name="Git.Settings">
@@ -131,9 +132,9 @@ @@ -131,9 +132,9 @@
131 <list> 132 <list>
132 <option value="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" /> 133 <option value="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" />
133 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" /> 134 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" />
134 - <option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />  
135 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" /> 135 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" />
136 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" /> 136 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
  137 + <option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
137 </list> 138 </list>
138 </option> 139 </option>
139 </component> 140 </component>
@@ -657,12 +658,12 @@ @@ -657,12 +658,12 @@
657 <updated>1545890692513</updated> 658 <updated>1545890692513</updated>
658 <workItem from="1545890694011" duration="11746000" /> 659 <workItem from="1545890694011" duration="11746000" />
659 <workItem from="1545905663805" duration="1370000" /> 660 <workItem from="1545905663805" duration="1370000" />
660 - <workItem from="1545965888175" duration="16975000" /> 661 + <workItem from="1545965888175" duration="17267000" />
661 </task> 662 </task>
662 <servers /> 663 <servers />
663 </component> 664 </component>
664 <component name="TimeTrackingManager"> 665 <component name="TimeTrackingManager">
665 - <option name="totallyTimeSpent" value="30091000" /> 666 + <option name="totallyTimeSpent" value="30383000" />
666 </component> 667 </component>
667 <component name="ToolWindowManager"> 668 <component name="ToolWindowManager">
668 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 669 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -682,8 +683,9 @@ @@ -682,8 +683,9 @@
682 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4409836" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 683 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4409836" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
683 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 684 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
684 <window_info id="Designer" active="false" anchor="left" 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" /> 685 <window_info id="Designer" active="false" anchor="left" 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" />
685 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" /> 686 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
686 <window_info id="Database" 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="3" side_tool="false" content_ui="tabs" /> 687 <window_info id="Database" 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="3" side_tool="false" content_ui="tabs" />
  688 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
687 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 689 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
688 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> 690 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
689 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 691 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -695,8 +697,37 @@ @@ -695,8 +697,37 @@
695 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 697 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
696 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="combo" /> 698 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="combo" />
697 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> 699 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
698 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />  
699 </layout> 700 </layout>
  701 + <layout-to-restore>
  702 + <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="6" side_tool="false" content_ui="tabs" />
  703 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  704 + <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  705 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  706 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  707 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
  708 + <window_info id="Maven Projects" 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="0" side_tool="false" content_ui="tabs" />
  709 + <window_info id="Properties" 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" />
  710 + <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  711 + <window_info id="Designer" active="false" anchor="left" 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" />
  712 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="combo" />
  713 + <window_info id="Database" 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="3" side_tool="false" content_ui="tabs" />
  714 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  715 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
  716 + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  717 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  718 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
  719 + <window_info id="Palette&#9;" 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="2" side_tool="false" content_ui="tabs" />
  720 + <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  721 + <window_info id="Capture Analysis" 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="4" side_tool="false" content_ui="tabs" />
  722 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
  723 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  724 + <window_info id="Version Control" active="false" anchor="bottom" 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" />
  725 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4409836" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  726 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
  727 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  728 + <window_info id="Theme Preview" 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="5" side_tool="false" content_ui="tabs" />
  729 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
  730 + </layout-to-restore>
700 </component> 731 </component>
701 <component name="TypeScriptGeneratedFilesManager"> 732 <component name="TypeScriptGeneratedFilesManager">
702 <option name="processedProjectFiles" value="true" /> 733 <option name="processedProjectFiles" value="true" />
@@ -805,14 +836,6 @@ @@ -805,14 +836,6 @@
805 </state> 836 </state>
806 </provider> 837 </provider>
807 </entry> 838 </entry>
808 - <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">  
809 - <provider selected="true" editor-type-id="text-editor">  
810 - <state relative-caret-position="-526">  
811 - <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />  
812 - <folding />  
813 - </state>  
814 - </provider>  
815 - </entry>  
816 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/deploy.sh"> 839 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/deploy.sh">
817 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
818 <state relative-caret-position="0"> 841 <state relative-caret-position="0">
@@ -831,16 +854,24 @@ @@ -831,16 +854,24 @@
831 </entry> 854 </entry>
832 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json"> 855 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
833 <provider selected="true" editor-type-id="text-editor"> 856 <provider selected="true" editor-type-id="text-editor">
834 - <state relative-caret-position="248">  
835 - <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" /> 857 + <state relative-caret-position="329">
  858 + <caret line="40" column="79" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="79" />
836 <folding /> 859 <folding />
837 </state> 860 </state>
838 </provider> 861 </provider>
839 </entry> 862 </entry>
840 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 863 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
841 <provider selected="true" editor-type-id="text-editor"> 864 <provider selected="true" editor-type-id="text-editor">
842 - <state relative-caret-position="54">  
843 - <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> 865 + <state relative-caret-position="-54">
  866 + <caret line="13" column="112" lean-forward="false" selection-start-line="13" selection-start-column="100" selection-end-line="13" selection-end-column="112" />
  867 + <folding />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="311">
  874 + <caret line="86" column="14" lean-forward="false" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
844 <folding /> 875 <folding />
845 </state> 876 </state>
846 </provider> 877 </provider>
@@ -52,6 +52,21 @@ pipeline { @@ -52,6 +52,21 @@ pipeline {
52 } 52 }
53 } 53 }
54 54
  55 + stage('aws deploy'){
  56 + steps{
  57 + script {
  58 + println "begin upload to cdn"
  59 + if(params.deployEnv=='aws' || params.deployEnv=='all'){
  60 + //切换kubectl的认证
  61 + def shellworkdir="${env.WORKSPACE}/Docker-Image-Deplopy/aws/awsdeploy.sh"
  62 + sh "sh ${shellworkdir} ${params.serviceName} ${params.imageInfo}"
  63 + }else {
  64 + println "aws this no need restart"
  65 + }
  66 + }
  67 + }
  68 + }
  69 +
55 70
56 71
57 72
@@ -69,7 +84,7 @@ pipeline { @@ -69,7 +84,7 @@ pipeline {
69 post { 84 post {
70 always { 85 always {
71 echo "clean up our workspace" 86 echo "clean up our workspace"
72 - deleteDir() /* clean up our workspace */ 87 + /* deleteDir() clean up our workspace */
73 } 88 }
74 } 89 }
75 } 90 }
@@ -11,7 +11,7 @@ CLUSTER=web @@ -11,7 +11,7 @@ CLUSTER=web
11 11
12 12
13 #Replace the build number and respository URI placeholders with the constants above 13 #Replace the build number and respository URI placeholders with the constants above
14 -sed -e "s;%BUILD_VERSION%;${BUILD_NUMBER};g" ${SERVICE_NAME}-trmplate.json > ${SERVICE_NAME}-v_${BUILD_NUMBER}.json 14 +sed -e "s;%IMAGE_VERSION%;${REPOSITORY_NAME};g" ${SERVICE_NAME}-trmplate.json > ${SERVICE_NAME}-v_${BUILD_NUMBER}.json
15 #Register the task definition in the repository 15 #Register the task definition in the repository
16 aws ecs register-task-definition --family ${SERVICE_NAME} --cli-input-json file://${WORKSPACE}/${SERVICE_NAME}-v_${BUILD_NUMBER}.json --region ${REGION} 16 aws ecs register-task-definition --family ${SERVICE_NAME} --cli-input-json file://${WORKSPACE}/${SERVICE_NAME}-v_${BUILD_NUMBER}.json --region ${REGION}
17 SERVICES=`aws ecs describe-services --services ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION} | jq .failures[]` 17 SERVICES=`aws ecs describe-services --services ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION} | jq .failures[]`
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 "memory": null, 38 "memory": null,
39 "memoryReservation": 400, 39 "memoryReservation": 400,
40 "volumesFrom": [], 40 "volumesFrom": [],
41 - "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/yoho-online/yohobuy-node:%BUILD_VERSION%", 41 + "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/%IMAGE_VERSION%",
42 "disableNetworking": null, 42 "disableNetworking": null,
43 "interactive": null, 43 "interactive": null,
44 "healthCheck": null, 44 "healthCheck": null,