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

382 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dylan Meissner
a9925c7521 The included Marathon tmpl converts multiple slashes in Marathon app names to dashes. 2015-12-05 10:02:39 -08:00
Vincent Demeester
f955cc33c5 Merge pull request #134 from emilevauge/add-getBool-kvprovider-or-not 
Removes getBool from kv provider
 2015-12-04 09:41:36 +01:00
emile
e728f32a15 Removes getBool from kv provider, fixes https://github.com/emilevauge/traefik/issues/117 2015-12-04 09:28:43 +01:00
Vincent Demeester
4abb4c6489 Merge pull request #135 from ViBiOh/master 
Adding expose for default port
 2015-12-03 17:45:22 +01:00
Vincent Boutour
66998e60b8 Adding expose for default port 2015-12-03 17:15:01 +01:00
Vincent Demeester
71288e5799 Merge pull request #123 from emilevauge/alltasks-status-marathon 
Add filter task by running status in marathon
 2015-12-02 09:49:28 +01:00
emile
8fdd0b20d1 Add filter task by running status in marathon 2015-12-01 22:53:31 +01:00
Emile Vauge
4e9ff45747 Merge pull request #121 from janeczku/sni-support 
Add TLS SNI support
 2015-12-01 22:52:27 +01:00
Jan Broer
d6e28a923c Adds TLS SNI support for the frontends 2015-12-01 22:26:17 +01:00
Vincent Demeester
1604786285 Merge pull request #126 from emilevauge/lock-prepareserver 
Add mutex around prepareserver
 2015-11-24 10:20:44 +01:00
emile
35cb9100cd Add mutex around prepareserver 2015-11-24 09:12:20 +01:00
Vincent Demeester
4729e3e999 Merge pull request #124 from emilevauge/panic-bad-configuration 
Add check in invoked method
 2015-11-23 20:54:16 +01:00
emile
b0e66a4aa6 Add check invoked method 2015-11-23 16:06:47 +01:00
Vincent Demeester
4218467ab3 Merge pull request #122 from emilevauge/add-getBool-kvprovider 
Add GetBool function in KV provider, used by passHostHeader
 2015-11-23 08:38:35 +01:00
emile
6e62625ebf Add GetBool function in KV provider, used by passHostHeader 2015-11-22 23:39:43 +01:00
Vincent Demeester
c8a0a83e2b Merge pull request #120 from starpost/docker-tls 
Docker TLS support
 2015-11-20 18:51:36 +01:00
KM Tong
76bd04e349 Merge branch 'master' into docker-tls 2015-11-20 23:13:26 +08:00
唐家文
a8a78b8ea3 docker TLS support 2015-11-20 23:05:06 +08:00
Emile Vauge
3435ebfe42 Merge pull request #108 from vdemeester/refactor-providers-with-test 
Refactor providers and add unit tests
 2015-11-19 19:42:03 +01:00
Vincent Demeester
4d485e1b6b Refactor providers and add tests 
- Add a `baseProvider` struct with common
- Refactor docker, kv(s) and marathon providers (spliting into small pieces)
- Add unit tests

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-19 17:22:17 +01:00
Vincent Demeester
3f905ee7d0 Merge pull request #112 from bennyhansson/master 
Add passHostHeader to kv frontend definition.
 2015-11-17 16:28:59 +01:00
Benny Hansson
e90cb6b53b Add passHostHeader to frontend definition. 2015-11-16 22:51:52 +01:00
Vincent Demeester
400655f212 Merge pull request #109 from polds/docker/clean-frontend 
Replace [ and ] in frontend names
 2015-11-13 09:35:14 +01:00
Peter Olds
481a4b2096 Replace [ and ] in frontend names 
Signed-off-by: Peter Olds <polds@kyanicorp.com>
 2015-11-12 17:04:19 -07:00
Emile Vauge
85bbd49798 Merge pull request #96 from vdemeester/validate-golint 
Add validate-golint target and script …
 2015-11-08 20:05:01 +01:00
Vincent Demeester
40391c57c2 Add validate-golint target and script … 
… and *lint* the latest piece of code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-06 18:11:57 +01:00
Emile Vauge
7607eb173b Merge pull request #94 from vdemeester/fix-labels-docker 
Fix docker labels (frontend.*) non-presence
 2015-11-05 15:50:30 +01:00
Vincent Demeester
15318c4631 Fix docker labels (frontend.*) 
Using Docker provider, you can specify `traefik.frontend.rule` and
`traefik.frontend.value` labels. If they are not both provided, there is
a default behavior. On the current master, if they are not defined, the
container is filtered (and thus the default behavior is broken).

Fixes that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-05 15:14:25 +01:00
Emile Vauge
7be566ef7c Merge pull request #93 from vdemeester/integration-test-simple 
Updates and additions on some integration tests
 2015-11-04 09:12:41 +01:00
Vincent Demeester
3c9ec55f0a Updates and additions on some integration tests 
- Use defer to kill traefik process (to fix the still running traefik
  binaries if the given tests is failing before the kill)
- Add TestWithWebConfig
- Add *.test to gitignore to ignore the test binaries generated by go.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-03 23:06:31 +01:00
Emile Vauge
5ee6981410 Merge pull request #92 from vdemeester/linting-some-packages 
Linting some packages
 2015-11-02 22:47:45 +01:00
Vincent Demeester
c32f82baee Linting types package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 21:15:10 +01:00
Vincent Demeester
89bb1ae835 Linting provider package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 21:15:03 +01:00
Vincent Demeester
9387235a04 Linting middlewares package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 21:14:54 +01:00
Emile Vauge
7766d0ddaa Merge pull request #88 from vdemeester/refactor-package 
Refactor traefik with package
 2015-11-02 21:08:29 +01:00
Vincent Demeester
cdade5f649 Rename NameProvider to Name 
Because golint is gonna cry at some point otherwise.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 19:48:34 +01:00
Vincent Demeester
de0a57ec76 Refactor traefik with package 
Split a bit traefik into package. The idea behind this refactor is to
start move inter-dependencies away and do some DRY or SRP.

- Adds a `provider` package, with providers except `web.go`
- Adds a `types` package with common struct.
- Move `gen.go` to an `autogen` package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 18:35:55 +01:00
Emile Vauge
6e1a0554c0 Merge pull request #91 from vdemeester/go-bindata-out-of-generation 
Remove go get go-bindata from generate.go
 2015-11-02 16:36:20 +01:00
Vincent Demeester
ae73d08d67 Remove go get go-bindata from generate.go 
This mades the build impossible offline (as when doing a go generate it
was trying to go get something)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 13:56:55 +01:00
Emile Vauge
ddceefa4e1 Merge pull request #90 from vdemeester/move-version-away 
Move version info in its own file.
 2015-11-02 10:29:34 +01:00
Vincent Demeester
80cd6c3699 Move version info in its own file. 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 09:14:49 +01:00
Vincent Demeester
9cfd0a6b26 Merge pull request #87 from emilevauge/add-passhostheader 
Add passhostheader in frontends configuration
 2015-11-02 09:07:14 +01:00
emile
1e99ecf583 Add passHostHeader in frontend configuration, added traefik.frontend.passHostHeader label 2015-11-02 08:40:54 +01:00
Vincent Demeester
aae7941689 Merge pull request #83 from emilevauge/marathon-filter-healthchecks 
Add healthcheck filter in marathon tasks
 2015-11-01 22:27:28 +01:00
emile
d888b4fcb5 Added healthcheck filter in marathon tasks 2015-11-01 22:06:05 +01:00
Emile Vauge
b029e7eded Merge pull request #84 from vdemeester/ignore-me 
Add .dockerignore to lightweight build context
 2015-10-30 13:15:34 +01:00
Vincent Demeester
6f3afe8213 Add .dockerignore to lightweight build context 
Ignoring vendor/ and dist/

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-30 12:10:13 +01:00
Emile Vauge
b4c019afb6 Merge pull request #85 from vdemeester/make-me-happy 
Add a all target than runs default tasks
 2015-10-30 12:03:06 +01:00
Vincent Demeester
143ea86ab9 Add a all target than runs default tasks 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-30 09:11:43 +01:00
Vincent Demeester
287d5c59da Merge pull request #82 from vdemeester/pr-78 
Carry #78 Pass websocket headers to backend
 2015-10-29 22:56:51 +01:00