yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit eb838e15d2d5dce578b05e214ea8ce1ffe61cc3f 1 parent 6d6594c7

docker

Inline Side-by-side
Showing 3 changed files with 198 additions and 65 deletions
... ... @@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json" />
<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" />
<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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -59,7 +60,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true">
<file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
... ... @@ -69,11 +70,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="false">
<file leaf-file-name="yohobuy-node-template.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="40" column="79" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="79" />
<state relative-caret-position="351">
<caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="80" selection-end-line="40" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="yohobuy-node-template-1.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="65" selection-end-line="40" selection-end-column="80" />
<folding />
</state>
</provider>
... ... @@ -130,9 +141,9 @@
<list>
<option value="$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json" />
</list>
</option>
</component>
... ... @@ -656,12 +667,12 @@
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="18937000" />
<workItem from="1545965888175" duration="19187000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="32053000" />
<option name="totallyTimeSpent" value="32303000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -678,10 +689,10 @@
<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.4409836" 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" />
<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" />
<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" />
<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" />
<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" />
... ... @@ -850,14 +861,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="40" column="79" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="79" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="770">
... ... @@ -874,5 +877,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="65" selection-end-line="40" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="40" column="80" lean-forward="false" selection-start-line="40" selection-start-column="80" selection-end-line="40" selection-end-column="80" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
{
"ipcMode": null,
"executionRoleArn": null,
"containerDefinitions": [
{
"dnsSearchDomains": null,
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "yohobuy-log",
"awslogs-region": "cn-north-1",
"awslogs-stream-prefix": "awslogs-example"
}
},
"entryPoint": null,
"portMappings": [
{
"hostPort": 6002,
"protocol": "tcp",
"containerPort": 6002
}
],
"command": null,
"linuxParameters": null,
"cpu": 300,
"environment": [
{
"name": "NODE_ENV",
"value": "production"
}
],
"ulimits": null,
"dnsServers": null,
"mountPoints": [],
"workingDirectory": null,
"secrets": null,
"dockerSecurityOptions": null,
"memory": null,
"memoryReservation": 400,
"volumesFrom": [],
"image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/%IMAGE_VERSION%",
"disableNetworking": null,
"interactive": null,
"healthCheck": null,
"essential": true,
"links": null,
"hostname": null,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"systemControls": null,
"privileged": null,
"name": "yohobuy-node"
},
{
"dnsSearchDomains": null,
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "yohobuy-log",
"awslogs-region": "cn-north-1",
"awslogs-stream-prefix": "awslogs-example"
}
},
"entryPoint": null,
"portMappings": [
{
"hostPort": 80,
"protocol": "tcp",
"containerPort": 80
}
],
"command": null,
"linuxParameters": null,
"cpu": 400,
"environment": [],
"ulimits": null,
"dnsServers": null,
"mountPoints": [],
"workingDirectory": null,
"secrets": null,
"dockerSecurityOptions": null,
"memory": null,
"memoryReservation": 300,
"volumesFrom": [],
"image": "860721417875.dkr.ecr.cn-north-1.amazonaws.com.cn/yoho-online/nginx-yohobuy:201812257",
"disableNetworking": null,
"interactive": null,
"healthCheck": null,
"essential": true,
"links": null,
"hostname": null,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"systemControls": null,
"privileged": null,
"name": "nginx-yohobuy"
}
],
"placementConstraints": [],
"memory": "1800",
"taskRoleArn": null,
"compatibilities": [
"EC2"
],
"taskDefinitionArn": "arn:aws-cn:ecs:cn-north-1:860721417875:task-definition/yohobuy-node:7",
"family": "yohobuy-node",
"requiresAttributes": [
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "ecs.capability.task-eni"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.ecr-auth"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.21"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
}
],
"pidMode": null,
"requiresCompatibilities": null,
"networkMode": "awsvpc",
"cpu": "900",
"revision": 7,
"status": "ACTIVE",
"volumes": []
}
\ No newline at end of file
... ...
... ... @@ -102,57 +102,13 @@
"name": "nginx-yohobuy"
}
],
"placementConstraints": [],
"memory": "1800",
"taskRoleArn": null,
"compatibilities": [
"EC2"
],
"taskDefinitionArn": "arn:aws-cn:ecs:cn-north-1:860721417875:task-definition/yohobuy-node:7",
"taskRoleArn": "",
"family": "yohobuy-node",
"requiresAttributes": [
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "ecs.capability.task-eni"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.ecr-auth"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.21"
},
{
"targetId": null,
"targetType": null,
"value": null,
"name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
}
],
"pidMode": null,
"requiresCompatibilities": null,
"networkMode": "awsvpc",
"cpu": "900",
"revision": 7,
"status": "ACTIVE",
"volumes": []
"volumes": [],
"placementConstraints": []
}
\ No newline at end of file
... ...