yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 17aa86d921ccb2acd2285203d8af966cd5f20527 1 parent 0f1094ad

docker

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
... ... @@ -52,8 +52,8 @@
<file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="81">
<caret line="12" column="40" lean-forward="false" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
<folding />
</state>
</provider>
... ... @@ -609,12 +609,12 @@
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="14578000" />
<workItem from="1545965888175" duration="14792000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="27694000" />
<option name="totallyTimeSpent" value="27908000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -631,7 +631,7 @@
<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="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="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="true" show_stripe_button="true" weight="0.48688525" 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="false" show_stripe_button="true" weight="0.4409836" 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="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
... ... @@ -673,7 +673,7 @@
<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" />
<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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48688525" 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.4409836" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<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" />
<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" />
<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" />
... ... @@ -797,8 +797,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="81">
<caret line="12" column="40" lean-forward="false" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
<folding />
</state>
</provider>
... ...
... ... @@ -9,7 +9,8 @@ serviceName=$2
containerName=$3
imageInfo="ccr.ccs.tencentyun.com/$4"
if [[ "$clusterInfo" == "system-yoho-media" ]] || [[ "$clusterInfo" == "system-yoho-ops" ]] || [[ "$clusterInfo" == "system-yoho-web" ]] ||[[ "$clusterInfo" == "system-yoho-web-gray" ]];then
if [[ "$clusterInfo" != "system-yoho-media" ]] && [[ "$clusterInfo" != "system-yoho-ops" ]] && [[ "$clusterInfo" != "system-yoho-web" ]] && [[ "$clusterInfo" != "system-yoho-web-gray" ]];then
echo "$clusterInfo info is not right,please check the world"
exit 1
fi
... ...