yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 199d65d31c94b0af57dc2e73cb25efeb8bb65bf7 1 parent eb838e15

docker

Inline Side-by-side
Showing 2 changed files with 8 additions and 58 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="NEW" beforePath="" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json" />  
6 <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" />
7 <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" /> 6 <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" />
8 </list> 7 </list>
@@ -73,8 +72,8 @@ @@ -73,8 +72,8 @@
73 <file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="true"> 72 <file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="true">
74 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json"> 73 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
75 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
76 - <state relative-caret-position="351">  
77 - <caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="80" selection-end-line="40" selection-end-column="80" /> 75 + <state relative-caret-position="245">
  76 + <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
78 <folding /> 77 <folding />
79 </state> 78 </state>
80 </provider> 79 </provider>
@@ -667,12 +666,12 @@ @@ -667,12 +666,12 @@
667 <updated>1545890692513</updated> 666 <updated>1545890692513</updated>
668 <workItem from="1545890694011" duration="11746000" /> 667 <workItem from="1545890694011" duration="11746000" />
669 <workItem from="1545905663805" duration="1370000" /> 668 <workItem from="1545905663805" duration="1370000" />
670 - <workItem from="1545965888175" duration="19187000" /> 669 + <workItem from="1545965888175" duration="20032000" />
671 </task> 670 </task>
672 <servers /> 671 <servers />
673 </component> 672 </component>
674 <component name="TimeTrackingManager"> 673 <component name="TimeTrackingManager">
675 - <option name="totallyTimeSpent" value="32303000" /> 674 + <option name="totallyTimeSpent" value="33148000" />
676 </component> 675 </component>
677 <component name="ToolWindowManager"> 676 <component name="ToolWindowManager">
678 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 677 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -692,7 +691,7 @@ @@ -692,7 +691,7 @@
692 <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" /> 691 <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" />
693 <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" /> 692 <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" />
694 <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" /> 693 <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" />
695 - <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" /> 694 + <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" />
696 <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" /> 695 <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" />
697 <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" /> 696 <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" />
698 <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" /> 697 <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" />
@@ -732,7 +731,7 @@ @@ -732,7 +731,7 @@
732 <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" /> 731 <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" />
733 <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" /> 732 <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" />
734 <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" /> 733 <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" />
735 - <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" /> 734 + <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" />
736 <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" /> 735 <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" />
737 <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" /> 736 <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" />
738 <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" /> 737 <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" />
@@ -887,8 +886,8 @@ @@ -887,8 +886,8 @@
887 </entry> 886 </entry>
888 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json"> 887 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
889 <provider selected="true" editor-type-id="text-editor"> 888 <provider selected="true" editor-type-id="text-editor">
890 - <state relative-caret-position="351">  
891 - <caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="80" selection-end-line="40" selection-end-column="80" /> 889 + <state relative-caret-position="245">
  890 + <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
892 <folding /> 891 <folding />
893 </state> 892 </state>
894 </provider> 893 </provider>
1 { 1 {
2 - "ipcMode": null,  
3 - "executionRoleArn": null,  
4 "containerDefinitions": [ 2 "containerDefinitions": [
5 { 3 {
6 - "dnsSearchDomains": null,  
7 "logConfiguration": { 4 "logConfiguration": {
8 "logDriver": "awslogs", 5 "logDriver": "awslogs",
9 "options": { 6 "options": {
@@ -12,7 +9,6 @@ @@ -12,7 +9,6 @@
12 "awslogs-stream-prefix": "awslogs-example" 9 "awslogs-stream-prefix": "awslogs-example"
13 } 10 }
14 }, 11 },
15 - "entryPoint": null,  
16 "portMappings": [ 12 "portMappings": [
17 { 13 {
18 "hostPort": 6002, 14 "hostPort": 6002,
@@ -20,8 +16,6 @@ @@ -20,8 +16,6 @@
20 "containerPort": 6002 16 "containerPort": 6002
21 } 17 }
22 ], 18 ],
23 - "command": null,  
24 - "linuxParameters": null,  
25 "cpu": 300, 19 "cpu": 300,
26 "environment": [ 20 "environment": [
27 { 21 {
@@ -29,33 +23,13 @@ @@ -29,33 +23,13 @@
29 "value": "production" 23 "value": "production"
30 } 24 }
31 ], 25 ],
32 - "ulimits": null,  
33 - "dnsServers": null,  
34 "mountPoints": [], 26 "mountPoints": [],
35 - "workingDirectory": null,  
36 - "secrets": null,  
37 - "dockerSecurityOptions": null,  
38 - "memory": null,  
39 "memoryReservation": 400, 27 "memoryReservation": 400,
40 "volumesFrom": [], 28 "volumesFrom": [],
41 "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/%IMAGE_VERSION%", 29 "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/%IMAGE_VERSION%",
42 - "disableNetworking": null,  
43 - "interactive": null,  
44 - "healthCheck": null,  
45 - "essential": true,  
46 - "links": null,  
47 - "hostname": null,  
48 - "extraHosts": null,  
49 - "pseudoTerminal": null,  
50 - "user": null,  
51 - "readonlyRootFilesystem": null,  
52 - "dockerLabels": null,  
53 - "systemControls": null,  
54 - "privileged": null,  
55 "name": "yohobuy-node" 30 "name": "yohobuy-node"
56 }, 31 },
57 { 32 {
58 - "dnsSearchDomains": null,  
59 "logConfiguration": { 33 "logConfiguration": {
60 "logDriver": "awslogs", 34 "logDriver": "awslogs",
61 "options": { 35 "options": {
@@ -64,7 +38,6 @@ @@ -64,7 +38,6 @@
64 "awslogs-stream-prefix": "awslogs-example" 38 "awslogs-stream-prefix": "awslogs-example"
65 } 39 }
66 }, 40 },
67 - "entryPoint": null,  
68 "portMappings": [ 41 "portMappings": [
69 { 42 {
70 "hostPort": 80, 43 "hostPort": 80,
@@ -72,41 +45,19 @@ @@ -72,41 +45,19 @@
72 "containerPort": 80 45 "containerPort": 80
73 } 46 }
74 ], 47 ],
75 - "command": null,  
76 - "linuxParameters": null,  
77 "cpu": 400, 48 "cpu": 400,
78 "environment": [], 49 "environment": [],
79 - "ulimits": null,  
80 - "dnsServers": null,  
81 "mountPoints": [], 50 "mountPoints": [],
82 - "workingDirectory": null,  
83 - "secrets": null,  
84 - "dockerSecurityOptions": null,  
85 - "memory": null,  
86 "memoryReservation": 300, 51 "memoryReservation": 300,
87 "volumesFrom": [], 52 "volumesFrom": [],
88 "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/yoho-online/nginx-yohobuy:201812257", 53 "image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/yoho-online/nginx-yohobuy:201812257",
89 - "disableNetworking": null,  
90 - "interactive": null,  
91 - "healthCheck": null,  
92 "essential": true, 54 "essential": true,
93 - "links": null,  
94 - "hostname": null,  
95 - "extraHosts": null,  
96 - "pseudoTerminal": null,  
97 - "user": null,  
98 - "readonlyRootFilesystem": null,  
99 - "dockerLabels": null,  
100 - "systemControls": null,  
101 - "privileged": null,  
102 "name": "nginx-yohobuy" 55 "name": "nginx-yohobuy"
103 } 56 }
104 ], 57 ],
105 "memory": "1800", 58 "memory": "1800",
106 "taskRoleArn": "", 59 "taskRoleArn": "",
107 "family": "yohobuy-node", 60 "family": "yohobuy-node",
108 - "pidMode": null,  
109 - "requiresCompatibilities": null,  
110 "networkMode": "awsvpc", 61 "networkMode": "awsvpc",
111 "cpu": "900", 62 "cpu": "900",
112 "volumes": [], 63 "volumes": [],