docker

@@ -52,8 +52,8 @@
       <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
       <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
         <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="164">
-              <caret line="40" column="95" lean-forward="false" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="95" />
+            <state relative-caret-position="83">
+              <caret line="40" column="84" lean-forward="false" selection-start-line="40" selection-start-column="84" selection-end-line="40" selection-end-column="84" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -609,12 +609,12 @@
       <updated>1545890692513</updated>
       <updated>1545890692513</updated>
       <workItem from="1545890694011" duration="11746000" />
       <workItem from="1545890694011" duration="11746000" />
       <workItem from="1545905663805" duration="1370000" />
       <workItem from="1545905663805" duration="1370000" />
-      <workItem from="1545965888175" duration="11761000" />
+      <workItem from="1545965888175" duration="11972000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24877000" />
+    <option name="totallyTimeSpent" value="25088000" />
   </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" />
@@ -797,8 +797,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
     <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="40" column="95" lean-forward="false" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="95" />
+        <state relative-caret-position="83">
+          <caret line="40" column="84" lean-forward="false" selection-start-line="40" selection-start-column="84" selection-end-line="40" selection-end-column="84" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

@@ -38,9 +38,9 @@ do
     echo "print the cluster info "
     echo "print the cluster info "
     /usr/local/bin/kubectl get pods |grep $serviceName
     /usr/local/bin/kubectl get pods |grep $serviceName
     newrunning=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |awk '$3!="Running"' |wc -l)
     newrunning=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |awk '$3!="Running"' |wc -l)
-    newredy=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |awk '$2!="1/1" or $2!="2/2"' |wc -l)
+    newredy=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |awk '$2!="1/1" -o $2!="2/2"' |wc -l)
     echo "newrunning is $newrunning ,newredy is $newredy"
     echo "newrunning is $newrunning ,newredy is $newredy"
-    if [ "$newrunning" -eq 0  -o "$newredy" -eq 0 ];then
+    if [ "$newrunning" -eq 0  -a "$newredy" -eq 0 ];then
         echo "end with the cluster check the publish is ok"
         echo "end with the cluster check the publish is ok"
         break;
         break;
     fi
     fi