Skip to content

Commit 2391c39

Browse files
committed
Updated to use new nsc and mesos artifacts.
1 parent 6603da2 commit 2391c39

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const manifest = [
55
];
66

77
const dist = 'dist';
8-
const bundle = dist + '/webapi.tgz';
8+
const bundle = dist + '/bundle.tgz';
99

1010
module.exports = function(grunt) {
1111

marathon-service-description.json

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,70 @@
11
{
22
"id": "/website",
3-
"args": [
4-
"-u",
5-
"https://github.com/mesos-playground/webapi/releases/download/2017.09.17-2/webapi.tgz"
6-
],
7-
"instances": 3,
8-
"cpus": 0.1,
9-
"mem": 128,
10-
"disk": 0,
11-
"gpus": 0,
12-
"constraints": [],
13-
"fetch": [],
14-
"storeUrls": [],
15-
"backoffSeconds": 1,
163
"backoffFactor": 1.15,
17-
"maxLaunchDelaySeconds": 3600,
4+
"backoffSeconds": 1,
185
"container": {
6+
"portMappings": [
7+
{
8+
"containerPort": 3000,
9+
"hostPort": 0,
10+
"labels": {
11+
"VIP_0": "/website:3000"
12+
},
13+
"protocol": "tcp",
14+
"servicePort": 80,
15+
"name": "web"
16+
}
17+
],
1918
"type": "DOCKER",
2019
"volumes": [],
2120
"docker": {
22-
"image": "mesosplayground/nsc",
23-
"network": "USER",
24-
"portMappings": [
25-
{
26-
"containerPort": 3000,
27-
"hostPort": 0,
28-
"servicePort": 80,
29-
"protocol": "tcp",
30-
"name": "web",
31-
"labels": {
32-
"VIP_0": "/website:3000"
33-
}
34-
}
35-
],
21+
"image": "mesosplayground/nsc:boron",
22+
"forcePullImage": false,
3623
"privileged": false,
37-
"parameters": [],
38-
"forcePullImage": false
24+
"parameters": []
3925
}
4026
},
27+
"cpus": 0.1,
28+
"disk": 0,
4129
"healthChecks": [
4230
{
4331
"gracePeriodSeconds": 300,
4432
"intervalSeconds": 60,
45-
"timeoutSeconds": 20,
4633
"maxConsecutiveFailures": 3,
4734
"portIndex": 0,
48-
"path": "/api/health/_ping",
35+
"timeoutSeconds": 20,
36+
"delaySeconds": 15,
4937
"protocol": "MESOS_HTTP",
50-
"delaySeconds": 15
38+
"path": "/api/health/_ping"
5139
}
5240
],
53-
"readinessChecks": [],
54-
"dependencies": [],
55-
"upgradeStrategy": {
56-
"minimumHealthCapacity": 1,
57-
"maximumOverCapacity": 1
41+
"instances": 1,
42+
"labels": {
43+
"HAPROXY_GROUP": "external"
5844
},
59-
"ipAddress": {
60-
"groups": [],
61-
"networkName": "dcos"
45+
"maxLaunchDelaySeconds": 3600,
46+
"mem": 128,
47+
"gpus": 0,
48+
"networks": [
49+
{
50+
"name": "dcos",
51+
"mode": "container"
52+
}
53+
],
54+
"requirePorts": false,
55+
"upgradeStrategy": {
56+
"maximumOverCapacity": 1,
57+
"minimumHealthCapacity": 1
6258
},
59+
"killSelection": "YOUNGEST_FIRST",
6360
"unreachableStrategy": {
6461
"inactiveAfterSeconds": 300,
6562
"expungeAfterSeconds": 600
6663
},
67-
"killSelection": "YOUNGEST_FIRST",
68-
"requirePorts": false,
69-
"labels": {
70-
"HAPROXY_GROUP": "external"
71-
}
64+
"fetch": [
65+
{
66+
"uri": "https://github.com/mesos-playground/webapi/releases/download/2017.09.22-1/bundle.tgz"
67+
}
68+
],
69+
"constraints": []
7270
}

0 commit comments

Comments
 (0)