deploy

jimi.ji
Commit fa923804967c509e66298907f7ceaa307e37222e 1 parent 1041ed17
Showing 2 changed files with 14 additions and 13 deletions
.idea/workspace.xml
Docker-Image-Deplopy/aws/awsdeploy.sh
--- a/.idea/workspace.xml
View file @fa92380
+++ b/.idea/workspace.xml
View file @fa92380
@@ -2,6 +2,7 @@
 <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-Image-Deplopy/aws/awsdeploy.sh" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -51,8 +52,8 @@
       <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="47" />
+            <state relative-caret-position="189">
+              <caret line="55" column="58" lean-forward="false" selection-start-line="55" selection-start-column="58" selection-end-line="55" selection-end-column="58" />
               <folding />
             </state>
           </provider>
@@ -158,8 +159,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="3" />
+    <option name="y" value="229" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
@@ -658,15 +659,15 @@
       <workItem from="1545890694011" duration="11746000" />
       <workItem from="1545905663805" duration="1370000" />
       <workItem from="1545965888175" duration="20585000" />
-      <workItem from="1546047561789" duration="9630000" />
+      <workItem from="1546047561789" duration="10646000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43331000" />
+    <option name="totallyTimeSpent" value="44347000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
+    <frame x="3" y="229" width="1382" height="744" extended-state="0" />
     <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="6" side_tool="false" content_ui="tabs" />
@@ -680,7 +681,7 @@
       <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" />
       <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" />
       <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" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2590164" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2590164" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <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" />
       <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" />
       <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" />
@@ -999,8 +1000,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="47" />
+        <state relative-caret-position="189">
+          <caret line="55" column="58" lean-forward="false" selection-start-line="55" selection-start-column="58" selection-end-line="55" selection-end-column="58" />
           <folding />
         </state>
       </provider>
--- a/Docker-Image-Deplopy/aws/awsdeploy.sh
View file @fa92380
+++ b/Docker-Image-Deplopy/aws/awsdeploy.sh
View file @fa92380
@@ -52,9 +52,9 @@ do
     EVENTMESSAGE=`aws ecs describe-services --cluster ${CLUSTER} --services ${SERVICE_NAME} |jq .services[].events[0].message`
     EVENTMESSAGENORMAL=(service "${SERVICE_NAME}") has reached a steady state
-    echo "check event result : aws cli is $EVENTMESSAGE"
-    echo "check event result : EVENTMESSAGENORMAL cli is $EVENTMESSAGENORMAL"
-    if [[ $EVENTMESSAGE == *$EVENTMESSAGENORMAL* ]] ;then
+    echo "check event result : aws cli is : $EVENTMESSAGE"
+    echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL"
+    if [[ $EVENTMESSAGE =~ $EVENTMESSAGENORMAL ]] ;then
        echo "check aws event is succeed"
        break;
     fi