homelab/traefik
1
0
Fork 0
Code Activity

Add basic authentication support in Marathon

Browse source
This commit is contained in:
emile 2016-01-18 11:52:18 +01:00
parent 707b6f9a95
commit c46ffed846
No known key found for this signature in database
GPG key ID: D808B4C167352E59
4 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/compose-marathon.yml
View file

@ -6,7 +6,7 @@ zk:
ZK_ID: 1
master:
image: mesosphere/mesos-master:0.23.0-1.0.ubuntu1404
image: mesosphere/mesos-master:0.26.0-0.2.145.ubuntu1404
net: host
environment:
MESOS_ZK: zk://127.0.0.1:2181/mesos
@ -17,7 +17,7 @@ master:
MESOS_WORK_DIR: /var/lib/mesos
slave:
image: mesosphere/mesos-slave:0.23.0-1.0.ubuntu1404
image: mesosphere/mesos-slave:0.26.0-0.2.145.ubuntu1404
net: host
pid: host
privileged: true
@ -33,7 +33,7 @@ slave:
- /var/run/docker.sock:/var/run/docker.sock
marathon:
image: mesosphere/marathon:v0.9.2
image: mesosphere/marathon:v0.13.0
net: host
environment:
MARATHON_MASTER: zk://127.0.0.1:2181/mesos

13
tests/whoami.json
View file

@ -10,14 +10,7 @@
"network": "BRIDGE",
"portMappings": [
{ "containerPort": 80, "hostPort": 0, "protocol": "tcp" }
],
"parameters": [{
"key": "log-driver",
"value": "gelf"
}, {
"key": "log-opt",
"value": "gelf-address=udp://172.17.42.1:12201"
}]
]
}
},
"healthChecks": [
@ -32,8 +25,6 @@
],
"labels": {
"traefik.weight": "1",
"traefik.protocole": "https",
"traefik.frontend.rule": "Path",
"traefik.frontend.value": "/test"
"traefik.protocole": "http"
}
}