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

2458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
223e8cafac
Fix default KV configuration 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-09 23:44:49 +02:00
Emile Vauge
d1ffbd8a03 Merge pull request #443 from vdemeester/442-and-share-context 
Fix panic if listContainers fails…
 2016-06-09 09:37:48 +02:00
Vincent Demeester
f286cb9a34
Fix panic if listContainers fails… 
… and also share context accross API call, as this is how it's meant to
be used (and it allows to skip some calls if `cancel` is called).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-08 19:39:38 +02:00
Emile Vauge
5c63855cc0
Merge branch 'AlmogBaku-master' 2016-06-07 20:19:51 +02:00
Emile Vauge
2a96ae9ec2
Merge branch 'master' of https://github.com/AlmogBaku/traefik into AlmogBaku-master 2016-06-07 20:19:21 +02:00
Samuel BERTHE
36a2da0659 Merge pull request #440 from containous/emilevauge-add-samber-to-maintainers 
Add @samber to maintainers
 2016-06-07 20:15:08 +02:00
Emile Vauge
38abec520c Add @samber to maintainers 2016-06-07 19:45:12 +02:00
Almog Baku
1274d26b4c Merge branch 'master' into master 2016-06-07 19:45:53 +03:00
Vincent Demeester
6556c79207 Merge pull request #433 from containous/add-routes-priorities 
Add routes priorities
 2016-06-07 10:10:19 +02:00
Emile Vauge
7e6c580130
Add routes priorities in documentation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:54:12 +02:00
Emile Vauge
cc4fb64b34
Add routes priorities in integration tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge
f4cb4bb1b8
Add routes priorities in providers 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge
287b3ba1f4
Add routes priorities test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge
208998972a
Add routes priorities 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:17:39 +02:00
Vincent Demeester
7cdd062432 Merge pull request #435 from fclaeys/multiRules 
Allow multiple rules
 2016-06-07 09:12:39 +02:00
Fabrice CLAEYS
eccb529605 update docs 2016-06-07 08:52:43 +02:00
Fabrice CLAEYS
78dc28cce8 test rules parsing 2016-06-06 17:20:01 +02:00
Fabrice CLAEYS
84076db78e allow multiple rules 2016-06-06 09:22:23 +02:00
Almog Baku
c3779f0e94 Merge branch 'master' into master 2016-06-04 18:49:26 +03:00
Emile Vauge
c5ac563e74 Merge pull request #426 from containous/fix-marathon-directory-subdomain 
Fix marathon groups subdomain
 2016-06-03 11:39:40 +02:00
Emile Vauge
92ca220890
Add groupsAsSubDomains option 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-03 09:10:59 +02:00
Emile Vauge
72f88e5c0f
Add marathon directory subdomain 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-03 09:10:59 +02:00
Vincent Demeester
1a75a71ad6 Merge pull request #428 from containous/fix-default-configuration 
Fix default configuration
 2016-06-02 17:43:01 +02:00
Emile Vauge
3c3b179c29
Deploy PR Docker image 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-02 17:22:45 +02:00
Emile Vauge
3f08bb4cdf
Fix panic on help, Better version 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-02 15:17:04 +02:00
Emile Vauge
423268f485
Fix default configuration 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-02 11:51:36 +02:00
Vincent Demeester
d3f003a15f Merge pull request #415 from download13/docker_network 
Added getIPAddress helper for docker template
 2016-06-02 10:57:32 +02:00
Erin Dachtler
7386378cc0 Merge branch 'master' into docker_network 2016-06-01 08:38:23 -07:00
Vincent Demeester
d6547462e5 Merge pull request #342 from samber/TRAEFIK-311--adding-constraint-filtering 
feat(constraints): Implementation of constraint filtering (cmd + toml + matching functions), implementation proposal with consul
 2016-06-01 16:01:00 +02:00
Samuel BERTHE
d297a220ce fix(constraints): Syntax 2016-06-01 10:30:34 +02:00
Samuel BERTHE
1de5434e1a refacto(constraints): Migration to Flaeg cli library 2016-06-01 10:30:34 +02:00
Samuel BERTHE
f46accc74d test(constraint): unit tests + integration tests + make validate 2016-06-01 10:30:34 +02:00
Samuel BERTHE
cd2100ed84 doc(constraints): Added in ConsulCatalog backend + new 'Constraint' section 2016-06-01 10:30:34 +02:00
Samuel BERTHE
ac087921d8 feat(constraints): Implementation of constraint filtering (cmd + toml + matching functions), implementation proposal with consul 2016-06-01 10:30:34 +02:00
Erin Dachtler
82b1f14e2b Merge branch 'master' into docker_network 2016-05-31 22:19:45 -07:00
Erin Dachtler
df7e1cf078 Squashed commit of the following: 
commit 468cdf5c74b8df80fe6cc093feda84d124d47460
Author: Erin Dachtler <download333@gmail.com>
Date:   Mon May 30 17:21:50 2016 -0700

    Documentation update

commit bcbe622141fc333579177e056b49d418997c511d
Author: Erin Dachtler <download333@gmail.com>
Date:   Sat May 28 15:32:34 2016 -0700

    Whoops, forgot to fmt

commit 1ad5f1052541372722adc372069da094b422c793
Author: Erin Dachtler <download333@gmail.com>
Date:   Sat May 28 14:56:04 2016 -0700

    Added getIPAddress helper for docker template, and tests
 2016-05-31 22:11:17 -07:00
Emile Vauge
39fa8f7be4 Merge pull request #418 from samber/doc--tooling--integration-test-filtering 
Doc about skipping some integration tests with '-check.f ConsulCatalogSuite'
 2016-05-31 21:40:57 +02:00
Samuel BERTHE
46c2184de4 doc(tooling): Doc about selecting some tests with argument '-check.f' of gochecker library 2016-05-31 12:07:54 +02:00
Emile Vauge
a9f9894f29 Merge pull request #422 from containous/fix-travis-tag 
Fix travis tag check
 2016-05-31 00:15:58 +02:00
Emile Vauge
a6c360eeda
Fix travis hangs on docker version 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 23:59:27 +02:00
Emile Vauge
01a4002169
Fix travis tag check 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 23:44:53 +02:00
Emile Vauge
8caaf317ae Merge pull request #412 from containous/prepare-release-candidate 
Prepare release candidate
 2016-05-30 18:27:48 +02:00
Emile Vauge
0e3c2ef10f
Fix log config file 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 17:57:57 +02:00
Emile Vauge
db6c85d3d7
Prepare release candidate 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 17:48:50 +02:00
Vincent Demeester
2bd95620a5 Merge pull request #420 from cocap10/fixes-log 
log info about TOML configuration file using
 2016-05-30 17:48:00 +02:00
Martin
d8ad30f38a log info about TOML configuration file using 
+glide update flaeg & staert
+fix README.md
+fix configFile flag description

Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-05-30 17:04:26 +02:00
Vincent Demeester
aad5f52968 Merge pull request #416 from download13/no_require_expose 
Don't filter out containers with no exposed port if they have a traefik.port label set
 2016-05-30 11:21:49 +02:00
Erin Dachtler
f5d49f6657 Merge branch 'master' into no_require_expose 2016-05-28 16:36:59 -07:00
Erin Dachtler
53ae64e578 Filter containers with no exposed ports unless they have a traefik.port label 2016-05-28 15:16:57 -07:00
Vincent Demeester
1a936b6aca Merge pull request #403 from cocap10/migrate-to-staert 
Migrate to staert
 2016-05-27 16:41:44 +02:00