Skip to content

Commit 5d7e763

Browse files
committed
Merge pull request apache#13 from mesosphere/fix-demo
Fix demo ports
2 parents 35c109b + 33440f0 commit 5d7e763

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM jekyll/jekyll
1+
FROM jekyll/jekyll:3.1.3
22
ADD site /srv/jekyll

jobs/test-cd-demo/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<command>#!/bin/bash
3737

3838
# Run the container we just built
39-
docker run -d --name=test-container-${BUILD_NUMBER} -p 80:80 mesosphere/cd-demo-app:${GIT_COMMIT}
39+
docker run -d --name=test-container-${BUILD_NUMBER} mesosphere/cd-demo-app:${GIT_COMMIT}
4040

4141
# Grab IP address
4242
ip_address=$(docker inspect test-container-${BUILD_NUMBER} | jq -r &apos;.[0].NetworkSettings.IPAddress&apos;)
4343

4444
# Run linkchecker against website
45-
docker run mesosphere/linkchecker linkchecker --no-warnings http://$ip_address/
45+
docker run mesosphere/linkchecker linkchecker --no-warnings http://$ip_address:4000/
4646

4747
# Linkchecker exist with exit status 1 if it detects broken links
4848
exit_status=$?

marathon.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"network": "BRIDGE",
66
"portMappings": [
77
{
8-
"containerPort": 80,
8+
"containerPort": 4000,
99
"protocol": "tcp"
1010
}
1111
]
@@ -26,7 +26,7 @@
2626
"id": "cd-demo-app",
2727
"instances": 1,
2828
"labels": {
29-
"HAPROXY_0_VHOST": "52.37.191.145",
29+
"HAPROXY_0_VHOST": "sunil-ns1-publicsl-kvcfx6v2vw91-1799412267.us-west-2.elb.amazonaws.com",
3030
"HAPROXY_GROUP": "external",
3131
"lastChangedBy": "[email protected]"
3232
},

0 commit comments

Comments
 (0)