yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 0816d3354f918eedfe0630103d7d5deadcf0a024 1 parent 1bda1a96

docker

Inline Side-by-side
Showing 2 changed files with 10 additions and 7 deletions
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" />
7 </list> 6 </list>
8 <ignored path="$PROJECT_DIR$/out/" /> 7 <ignored path="$PROJECT_DIR$/out/" />
@@ -52,8 +51,8 @@ @@ -52,8 +51,8 @@
52 <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true"> 51 <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
53 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh"> 52 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
54 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="243">  
56 - <caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" /> 54 + <state relative-caret-position="54">
  55 + <caret line="11" column="130" lean-forward="false" selection-start-line="11" selection-start-column="130" selection-end-line="11" selection-end-column="130" />
57 <folding /> 56 <folding />
58 </state> 57 </state>
59 </provider> 58 </provider>
@@ -609,12 +608,12 @@ @@ -609,12 +608,12 @@
609 <updated>1545890692513</updated> 608 <updated>1545890692513</updated>
610 <workItem from="1545890694011" duration="11746000" /> 609 <workItem from="1545890694011" duration="11746000" />
611 <workItem from="1545905663805" duration="1370000" /> 610 <workItem from="1545905663805" duration="1370000" />
612 - <workItem from="1545965888175" duration="13575000" /> 611 + <workItem from="1545965888175" duration="14118000" />
613 </task> 612 </task>
614 <servers /> 613 <servers />
615 </component> 614 </component>
616 <component name="TimeTrackingManager"> 615 <component name="TimeTrackingManager">
617 - <option name="totallyTimeSpent" value="26691000" /> 616 + <option name="totallyTimeSpent" value="27234000" />
618 </component> 617 </component>
619 <component name="ToolWindowManager"> 618 <component name="ToolWindowManager">
620 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 619 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -797,8 +796,8 @@ @@ -797,8 +796,8 @@
797 </entry> 796 </entry>
798 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh"> 797 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
799 <provider selected="true" editor-type-id="text-editor"> 798 <provider selected="true" editor-type-id="text-editor">
800 - <state relative-caret-position="243">  
801 - <caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" /> 799 + <state relative-caret-position="54">
  800 + <caret line="11" column="130" lean-forward="false" selection-start-line="11" selection-start-column="130" selection-end-line="11" selection-end-column="130" />
802 <folding /> 801 <folding />
803 </state> 802 </state>
804 </provider> 803 </provider>
@@ -9,6 +9,10 @@ serviceName=$2 @@ -9,6 +9,10 @@ serviceName=$2
9 containerName=$3 9 containerName=$3
10 imageInfo="ccr.ccs.tencentyun.com/$4" 10 imageInfo="ccr.ccs.tencentyun.com/$4"
11 11
  12 +if [[ "$clusterInfo" == "system-yoho-media"]] || [[ "$clusterInfo" == "system-yoho-ops"]] || [[ "$clusterInfo" == "system-yoho-web"]] ||[[ "$clusterInfo" == "system-yoho-web-gray"]];then
  13 + exit 1
  14 +fi
  15 +
12 16
13 ## 切换当前的工作空间 17 ## 切换当前的工作空间
14 /usr/local/bin/kubectl config use-context $clusterInfo 18 /usr/local/bin/kubectl config use-context $clusterInfo