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

588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
ee60adc45a Merge pull request #315 from containous/add-backoff-marathon 
Add backoff to marathon provider
 2016-04-16 17:32:01 +02:00
Emile Vauge
36338b4928
add backoff to marathon provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-16 17:21:24 +02:00
Emile Vauge
23d3c512c2 Merge pull request #316 from vdemeester/docker-provider-stop-support 
Support stop chan on docker provider
 2016-04-16 17:20:55 +02:00
Vincent Demeester
4144638be4
Support stop chan on docker provider 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-16 14:46:35 +02:00
Emile Vauge
f2320ee648 Merge pull request #313 from containous/add-user-guide 
Add doc user guide with swarm
 2016-04-15 19:13:53 +02:00
Emile Vauge
17afa3e672
Add doc user guide with swarm 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-15 19:00:08 +02:00
Vincent Demeester
5b2c355c38 Merge pull request #305 from containous/fix-races 
Fix races
 2016-04-15 18:09:50 +02:00
Emile Vauge
61d54903e3
Fix doc 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Emile Vauge
c1078c4374
Fix races 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Emile Vauge
4e427b5a9e
remove error oxy log 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Vincent Demeester
227ec71db3 Merge pull request #306 from kevioke/oxy-glide-update 
Update glide files to use most recent version of containous/oxy
 2016-04-14 15:08:31 +02:00
kevin
d047b8daa1 Update glide files to use most recent version of containous/oxy 2016-04-13 14:51:14 -07:00
Emile Vauge
c2009b71b1 Merge pull request #303 from containous/emilevauge-bump-go1.6.1 
Bump to go v1.6.1
 2016-04-13 21:28:53 +02:00
Emile Vauge
ba8629e2ac
Bump to go v1.6.1 2016-04-13 21:09:39 +02:00
Vincent Demeester
6aba453afb Merge pull request #301 from kevioke/maxconns 
Add support for maximum connections for backends.
 2016-04-13 18:50:29 +02:00
kevin
a15578a8f6 Add support for maximum connections for backends. 2016-04-13 09:37:11 -07:00
Vincent Demeester
5c8d9f4eb9 Merge pull request #274 from samber/consul-catalog-with-tags-settings 
feat(traefik,consul-catalog): Set attributes from consul catalog tags (loadbalancer,circuitbreaker,weight)
 2016-04-13 17:17:10 +02:00
Emile Vauge
a9e615b3c7 Fix period in frontend name in KV store 2016-04-13 14:56:51 +02:00
Emile Vauge
94ad21020c Merge pull request #297 from containous/emilevauge-fix-period-frontend-kvstore 
Fix period in frontend name in KV store
 2016-04-13 13:25:52 +02:00
Emile Vauge
4b76cb4318
Fix period in frontend name in KV store 2016-04-13 13:00:20 +02:00
Vincent Demeester
fad7ec6b7f Merge pull request #299 from containous/add-better-benchmarks 
add better benchmarks
 2016-04-13 12:56:17 +02:00
Emile Vauge
82a49a8e89
add better benchmarks 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-13 12:17:53 +02:00
Vincent Demeester
2bcc5a2ac7 Merge pull request #294 from samber/TRAEFIK-275-consul-catalog-backend-using-container-internal-ip 
feat(consul-catalog-provider): + setting unique backend name + backendd redirecting to internal container ip
 2016-04-13 09:38:09 +02:00
Samuel BERTHE
4f044cf2f9 feat(consul-catalog-provider): + setting unique backend name + backend redirecting to internal container ip 2016-04-13 08:05:44 +02:00
Emile Vauge
9a407f79ff Merge pull request #291 from vdemeester/kewl-makefile 
Add a make help target
 2016-04-12 10:35:48 +02:00
Vincent Demeester
affec30c64 Add a make help target 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-12 10:09:16 +02:00
Emile Vauge
d050e60da2 Merge pull request #278 from vdemeester/migrate-to-engine-api 
Migrate docker provider traefik to engine-api
 2016-04-08 15:21:26 +02:00
Vincent Demeester
866b9835a6
Migrate traefik to engine-api 
The docker provider now uses docker/engine-api and
vdemeester/docker-events instead of fsouza-dockerclient.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-08 14:21:02 +02:00
Emile Vauge
f6564909aa Merge pull request #279 from vdemeester/update-dockerignore 
Add **/*.test to .dockerignore
 2016-04-07 17:22:53 +02:00
Vincent Demeester
315e8b64b8 Add **/*.test to .dockerignore 
`*.test` files are generated by `go test`, do not include them into the
build context. It will lighter a bit the build context..

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-07 16:48:35 +02:00
Emile Vauge
f99f634816 Merge pull request #290 from containous/fix-issues 
Fix issues
 2016-04-07 16:36:13 +02:00
Emile Vauge
5292a5b9d4
Migrate to official docker image 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-07 16:24:11 +02:00
Emile Vauge
cf22d62a74
Fix mkdoc deploy 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-07 16:24:11 +02:00
Emile Vauge
9363e2ab83
Fix broken table in webUI 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-07 16:24:11 +02:00
Emile Vauge
e5ddd92677
Fix port support in host rule 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-07 16:23:57 +02:00
Vincent Demeester
04628056af Merge pull request #287 from containous/fix-doc-deploy 
Fix doc deploy...
 2016-04-06 19:17:50 +02:00
Emile Vauge
dada86c0b0
Fix doc deploy... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 18:50:35 +02:00
Vincent Demeester
92c269c972 Merge pull request #286 from containous/fix-CI-env-variable 
Fix CI env variable...
 2016-04-06 17:45:34 +02:00
Emile Vauge
6991e3c99b
Fix CI env variable... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 17:31:43 +02:00
Vincent Demeester
3ee3daee00 Merge pull request #285 from containous/add-multiple-rules 
Add multiple rules
 2016-04-06 16:24:16 +02:00
Emile Vauge
85fcff4cf7
Multiple rules docs 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 16:10:20 +02:00
Emile Vauge
30db47d9b6
Fix SSH key, I hope... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 15:28:25 +02:00
Emile Vauge
4d2c85ffdc
Fix multiple response.WriteHeader calls 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 14:30:29 +02:00
Emile Vauge
e36433c23a
Fix retry attempts 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 14:07:51 +02:00
Emile Vauge
8486766a60
Add multiple rules 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-06 13:27:54 +02:00
Vincent Demeester
ef72d355d6 Merge pull request #283 from containous/fix-openssl-travis 
Fix SSH key
 2016-04-06 00:46:30 +02:00
Emile Vauge
7d013ad5e8
Fix SSH key 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-05 22:40:42 +02:00
Vincent Demeester
5fcce6567e Merge pull request #282 from containous/fix-openssl-travis 
Fix openssl travis
 2016-04-05 22:24:25 +02:00
Emile Vauge
00af537b0d
Fix link in README 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-05 22:07:16 +02:00
Emile Vauge
78449fa62f
Fix openssl load key in CI 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-05 20:47:23 +02:00