Commit graph

2581 commits

Author SHA1 Message Date
emile
c6c3af8099
Fix regression on marathon backend
Signed-off-by: emile <emile@vauge.com>
2016-02-12 15:03:28 +01:00
Emile Vauge
07c077cf94 Merge pull request #189 from vdemeester/fix-make-all
Fix make all
2016-02-10 14:10:26 +01:00
Vincent Demeester
4ac18f1989 Fix make all
Add build-ui as dependent target for all. Otherwise it does not build >_<

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-10 13:55:47 +01:00
Vincent Demeester
4ecb919787 Merge pull request #178 from emilevauge/add-multiple-entrypoints-support
Add multiple entry points support
2016-02-10 13:54:30 +01:00
emile
4152bd5e26
Update doc with entrypoints 2016-02-10 12:18:50 +01:00
emile
a8cc26fd91
Add entrypoints to providers 2016-02-10 12:14:16 +01:00
emile
81cb00573f
Fix tests to accept entrypoints 2016-02-10 12:14:16 +01:00
emile
c22598c8ff
Add multiple entry points support, add entry point redirection 2016-02-10 12:14:16 +01:00
Vincent Demeester
bb3b9f61cd Merge pull request #187 from emilevauge/add-max-idle-conns-per-host
Add MaxIdleConnsPerHost. Fixes too many open files error.
2016-02-09 22:49:03 +01:00
emile
49cd7f799e
Add MaxIdleConnsPerHost. Fixes too many open files error. 2016-02-09 22:29:01 +01:00
Vincent Demeester
8b334551d8 Merge pull request #185 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2016-02-08 19:15:41 +01:00
ReadmeCritic
5ef6d53d00 Update README URLs based on HTTP redirects 2016-02-08 07:43:43 -08:00
Vincent Demeester
901c9b29bc Merge pull request #171 from tayzlor/fix-170-marathon-getbackend
Fix #170 - getBackend for marathon plugin
2016-02-06 14:06:42 +01:00
Graham Taylor
2d79c500df Fix #170 - lookup backend for marathon plugin so we can specify traefik.backend via labels on the container 2016-02-05 18:01:47 +00:00
Vincent Demeester
d3598021b7 Merge pull request #184 from dontrebootme/master
Updated getEscapedName with slash to dash instead of space
2016-02-03 22:09:52 +01:00
Patrick O'Connor
31e0340959 Updated getEscapedName with slash to dash instead of space
Remove only the first slash, convert the rest to dash
2016-02-03 12:07:08 -08:00
Emile Vauge
cb46e8751b Merge pull request #177 from Hugues-Antoine/master
Updating documentation to make a more explicit usage of the traefik.frontend.rule rule when combined with traefik.frontend.value
2016-01-29 19:46:12 +01:00
Hugues-Antoine
739a836c52 Updating documentation to make a more explicit usage of the traefik.frontend.rule rule when combined with traefik.frontend.value 2016-01-29 18:59:31 +01:00
Vincent Demeester
1cbe00d613 Merge pull request #161 from emilevauge/add-env-args
Add environnement variables and arguments configuration
2016-01-29 11:49:33 +01:00
Vincent Demeester
10d92ca176 Merge branch 'master' into add-env-args 2016-01-29 11:34:15 +01:00
Vincent Demeester
257dbd188f Merge pull request #174 from ldez/feature/clean-static
refactor(webui): better build command
2016-01-27 22:55:22 +01:00
Fernandez Ludovic
38cc0579a6 refactor: add static to gitignore 2016-01-27 22:38:48 +01:00
Fernandez Ludovic
a9c8cda5ec refactor: remove static folder 2016-01-27 22:38:47 +01:00
Fernandez Ludovic
06654ff3a6 chore(webui): better build command
- clean before build (mode force)
- update documentation
- update `Makefile`
- ordering build
2016-01-27 22:38:10 +01:00
emile
f1b62b45f4
Fixes following review 2016-01-27 19:47:20 +01:00
emile
8adadaa5d4
Add launch configuration documentation 2016-01-27 13:56:46 +01:00
emile
35070f7c1c
Use of Viper and cobra 2016-01-27 13:56:46 +01:00
emile
a0b15a0efd
Main file refactoring, extract a Server object 2016-01-27 13:55:40 +01:00
Emile Vauge
b906e9361f Merge pull request #175 from emilevauge/glide-quick
Glide up quick
2016-01-27 11:18:09 +01:00
emile
ec2d7efe0e
Add --quick to glide up 2016-01-27 11:00:13 +01:00
Emile Vauge
81e9fdfe75 Merge pull request #172 from keis/sysd-service
Add minimal systemd service file
2016-01-22 18:33:43 +01:00
David Keijser
465bb133c7 Add minimal systemd service file 2016-01-22 14:46:38 +01:00
Vincent Demeester
c15d7e03b4 Merge pull request #149 from ldez/feature/webui-reload
New build system for Web UI
2016-01-21 10:17:17 +01:00
Fernandez Ludovic
5bfcfeb779 feat: build static file in global process
- Create a webui DockerFile
- add task `generate-webui`
- use task `generate-webui` in build process
2016-01-20 23:24:19 +01:00
Fernandez Ludovic
faa7fd0f05 docs(webui): add more documentation 2016-01-20 20:06:07 +01:00
Fernandez Ludovic
ab50b10d1b feat: generate new static files
- use new build system for generate static files
2016-01-20 20:06:07 +01:00
Fernandez Ludovic
b7a71edfcb feat: new Web UI build system
- use generator-gulp-angular by @swiip
- remove old static file
2016-01-20 20:06:07 +01:00
Vincent Demeester
587b17c120 Merge pull request #168 from emilevauge/add-marathon-basic-authentication
Add basic authentication support in Marathon
2016-01-19 09:17:01 +01:00
emile
c46ffed846
Add basic authentication support in Marathon 2016-01-18 13:23:38 +01:00
Vincent Demeester
707b6f9a95 Merge pull request #166 from danzel/patch-1
Consul config doesn't need "http://"
2016-01-15 09:04:12 +01:00
Dave Leaver
4bdc704a25 http here doesn't work 2016-01-15 11:53:13 +13:00
Emile Vauge
c0fd700904 Merge pull request #164 from vdemeester/bump-go
Bump Go 1.5.3
2016-01-14 16:00:51 +01:00
Vincent Demeester
72177c676e Bump Go 1.5.3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-14 15:45:23 +01:00
Vincent Demeester
784fd74d3f Merge pull request #138 from dylanmei/marathon_uses_port_from_label
Marathon provider uses port from label.
2016-01-13 08:30:00 +01:00
Dylan Meissner
cfbd43d1ee Marathon provider uses port or portIndex from label. 2016-01-12 06:46:29 -08:00
Vincent Demeester
f10bbd8c69 Merge pull request #153 from PierreZ/master
Fix Issue #150: Add possibility to have REST API in read-only mode
2016-01-09 00:32:53 +01:00
Pierre Zemb
6bcb6f92f5 Update Doc about read-only mode 2016-01-03 20:45:53 +01:00
PierreZ
f6b5684a5b adding read only mode 2016-01-03 20:42:09 +01:00
Vincent Demeester
866e8db5f7 Merge pull request #137 from dylanmei/marathon_route_names_with_slashes
Marathon tmpl converts slashes in Marathon app names to dashes
2015-12-07 22:12:45 +01:00
Dylan Meissner
a9925c7521 The included Marathon tmpl converts multiple slashes in Marathon app names to dashes. 2015-12-05 10:02:39 -08:00