baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
1565 commits 1 branch 0 tags 84 MiB
Commit graph

1565 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
870f378782 Merge pull request #748 from containous/really-fix-deploy-ghr 
Really fix deploy ghr...
 2016-10-19 12:14:54 +02:00
Emile Vauge
82a58010f5
Really fix deploy ghr... 2016-10-19 11:49:24 +02:00
Emile Vauge
f652c58367 Merge pull request #742 from containous/fix-deploy-ghr 
Fixes deploy ghr
 2016-10-19 10:56:54 +02:00
Emile Vauge
468d138be7
Fixes deploy ghr 2016-10-17 23:42:22 +02:00
Emile Vauge
f409d2f435 Merge pull request #740 from containous/prepare-v1.1.0-rc2 
prepare v1.1.0-rc2
 2016-10-17 19:38:23 +02:00
Emile Vauge
5780a17794
prepare v1.1.0-rc2 2016-10-17 19:14:49 +02:00
Hans Kristian Flaatten
9b765d23fa Update Kubernetes examples (#731) 
* Set `hostNetwork` to `true` in Kubernetes deployment example

* Remove duplicate Kubernetes examples

* Update Kubernetes Træfik Docker Image to 1.1.0
 2016-10-17 18:36:32 +02:00
Vincent Demeester
4476861d9f Merge pull request #733 from containous/fix-case-sensitive-hosts 
Fix case sensitive host
 2016-10-17 15:44:09 +02:00
Emile Vauge
e12ddca1a5
Fix case sensitive host 2016-10-17 13:52:29 +02:00
Emile Vauge
084d00a156 Merge pull request #728 from containous/fix-marathon-dots-ID 
fIx marathon template with dots in ID
 2016-10-13 16:23:00 +02:00
Emile Vauge
404a73a712
fIx marathon template with dots in ID 2016-10-13 15:33:23 +02:00
Vincent Demeester
3b2410d904 Merge pull request #720 from guilhem/marathon-lb 
Add basic compatibility with marathon-lb
 2016-10-12 20:47:38 +02:00
Guilhem Lettron
bd5009058b Merge branch 'v1.1' into marathon-lb 2016-10-12 15:51:41 +02:00
Emile Vauge
d3f79c7ad3 Merge pull request #724 from vincentlepot/fix_network_label_service 
Fix networkMap construction in ListServices
 2016-10-10 17:16:09 +02:00
Guilhem Lettron
3f65503a79 Add basic compatibility with marathon-lb 
Add compatibility with labels: `HAPROXY_GROUP` and `HAPROXY_0_VHOST`.
* `HAPROXY_GROUP` become a new tag
* `HAPROXY_0_VHOST` become a rule `Host:`

https://github.com/mesosphere/marathon-lb
 2016-10-07 19:30:16 +02:00
Vincent Lepot
6ac1216f8c Fix networkMap construction (pointer always reference the last network found) 2016-10-07 16:44:33 +02:00
Vincent Demeester
1cae35f96b Merge pull request #713 from oscerd/readme-fix 
Remove duplicated link to Kubernetes.io in README.md
 2016-10-07 11:20:16 +02:00
Andrea Cosentino
0d13e91a62 Remove duplicated link to Kubernetes.io in README.md 2016-10-07 08:13:06 +02:00
Emile Vauge
b1b600e09e Merge pull request #715 from vdemeester/update-docs-for-swarmmode 
Add documentation for Træfik on docker swarm mode
 2016-10-06 16:34:24 +02:00
Vincent Demeester
3692e1c4bd
Add documentation for Træfik on docker swarm mode 
Also small update on the swarm one.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-06 15:48:23 +02:00
Emile Vauge
dcbd82ac3b Merge pull request #717 from containous/update-README 
Add Ed's video at ContainerCamp
 2016-10-06 15:18:26 +02:00
Emile Vauge
d4f0541027
Fix mailgun/manners push force... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-06 14:58:49 +02:00
Emile Vauge
a30d8e7819
Add Ed's video at ContainerCamp 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-06 12:24:52 +02:00
Emile Vauge
8ee6bf044a Merge pull request #708 from vdemeester/docker-support-healthcheck 
Add support for docker healthcheck 👼
 2016-10-03 12:44:38 +02:00
Emile Vauge
6632247c9c Merge pull request #709 from vhf/webui-show-version 
Show current version in web UI
 2016-10-03 11:37:20 +02:00
Vincent Demeester
d68389dc52
Add support for docker healthcheck 
- React to health_status events
- Filter container that have a health status *and* that are not healthy

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-03 11:01:37 +02:00
Victor Felder
4a43273ee5 Show current version in web UI 2016-10-02 20:46:10 +02:00
Vincent Demeester
66f52a6e21 Merge pull request #707 from billglover/master 
Fix syntax in Swarm example. Resolves #528
 2016-10-02 14:00:34 +02:00
Bill Glover
640bfc4eff Fix syntax in Swarm example. Resolves #528 
Prior to this fix the documentation for the swarm example included
syntax that would fail with the following error.

`Error : flag needs an argument: --docker.domain`

This fix specifies flags using the `=` between the flag name and value.

Tested on: Docker version 1.12.2-rc1, build 45bed2c, experimental
 2016-10-01 22:37:15 +01:00
Emile Vauge
408ef0f5b7 Merge pull request #705 from containous/prepare-release-v1.1.0-rc1 
Prepare release v1.1.0 rc1
 2016-09-30 15:57:09 +02:00
Emile Vauge
b9f76394aa
Update Mesos documentation 2016-09-30 15:37:52 +02:00
Emile Vauge
a96f483d56
Fix regression in acme.json secure mode 2016-09-30 15:06:12 +02:00
Emile Vauge
84cb9f15a4
Prepare release v1.1.0-rc1 2016-09-30 15:04:57 +02:00
Emile Vauge
d4da14cf18 Merge pull request #625 from containous/add-ha-acme-support 
HA acme support
 2016-09-30 13:34:59 +02:00
Emile Vauge
4ad4b8e0b8
Add ACME account to storeconfig command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 12:29:39 +02:00
Emile Vauge
bb29d9c8ca
Add documentation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 12:29:39 +02:00
Emile Vauge
e72e65858f
Challenge certs PEM encoding 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:25 +02:00
Emile Vauge
a42845502e
Add ACME store 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:17 +02:00
Emile Vauge
bea5ad3f13
Add leadership election 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:05 +02:00
Emile Vauge
5a0440d6f8
Add KV datastore 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:05 +02:00
Emile Vauge
38b62d4ae3 Merge pull request #701 from containous/carry-pr-446 
Carry PR 446 - Add sticky session support (round two!)
 2016-09-30 11:25:26 +02:00
Emile Vauge
462d8b3e74
Fix Docker & KV templates for sticky 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 10:57:55 +02:00
Emile Vauge
291c3b6dbc
Fix sticky sessions Docker/Marathon labels 2016-09-30 10:56:47 +02:00
Owen Marshall
df225d9170
Change cookie name to match documentation 2016-09-30 10:56:36 +02:00
Owen Marshall
592e981bd2
glide up 2016-09-30 10:56:36 +02:00
Owen Marshall
3d7c44735a
Reorder sticky session definitions 2016-09-30 10:56:17 +02:00
Owen Marshall
81fddb4ccf
missed a cherry pick, good start :=/ 2016-09-30 10:56:17 +02:00
Owen Marshall
c9d4c5ae3e
Fix Docker integration problems 2016-09-30 10:56:17 +02:00
Owen Marshall
be5b1fd92b
docs, sticky session for Docker 2016-09-30 10:56:17 +02:00
Owen Marshall
d78c419627
Add sticky support to DRR lb 2016-09-30 10:56:17 +02:00