SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,167 Commits 21 Branches 402 Tags
253dbfab94e8292fea0ab37463d1415433285ed7
Commit Graph

1167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Laufenberg
253dbfab94 Small fixes and improvments 2017-02-22 16:30:54 +01:00
Emile Vauge
727f79f432 Merge pull request #1141 from containous/fix-stats-race 
Fix stats race condition
 2017-02-22 16:29:48 +01:00
Emile Vauge
6a56eb480b Fix stats race condition 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-22 15:02:26 +01:00
Emile Vauge
155d0900bb Merge pull request #1143 from lpetre/ecs_nil_checks 
Better ECS error checking
 2017-02-22 15:01:42 +01:00
Luke Petre
a59a165cd7 Try harder to query all the possible ec2 instances, and filter on instance state / lack of IP address 2017-02-22 13:38:11 +01:00
Emile Vauge
5d540be81b Merge pull request #1132 from Juliens/healthcheck 
Healthcheck tests and doc
 2017-02-21 14:03:13 +01:00
Julien Salleyron
05f2449d84 Wrong tests docker images 2017-02-21 11:09:19 +01:00
Julien Salleyron
44fa364cdd Add doc 2017-02-21 11:09:19 +01:00
Julien Salleyron
04a25b841f Add some integration test 2017-02-21 11:09:19 +01:00
Julien Salleyron
efbbff671c Add healthcheck interval 2017-02-21 11:09:19 +01:00
Emile Vauge
27c2c721ed Merge pull request #1137 from rickard-von-essen/ecs-docs 
ECS: Docs - info about cred. resolution and required access policies
 2017-02-09 12:08:26 +01:00
Rickard von Essen
abe16d4480 ECS: Docs - info about cred. resolution and required access policies 
Added information about how AWS credentials are resolved and which
access rights is needed the Traefik ECS provider.
 2017-02-08 20:19:39 +01:00
Emile Vauge
445bb8189b Merge pull request #1128 from containous/fix-travis-deploy 
Fix travis deploy
v1.2.0-rc1 		2017-02-06 21:36:30 +01:00
Emile Vauge
ff7dfdcd43 Fix travis deploy 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 21:32:57 +01:00
Emile Vauge
5e662c9dbd Merge pull request #1126 from containous/prepare-release-v1.2.0-rc1 
Prepare release v1.2.0 rc1
 2017-02-06 20:52:30 +01:00
Emile Vauge
78d60b3651 Changelog for v1.2.0-rc1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 19:54:28 +01:00
Emile Vauge
7a7992a639 Add v1.2 codename 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 18:51:56 +01:00
Emile Vauge
39f8f6868a Merge pull request #1124 from containous/fix-git-rmpr 
Fix checkout initial before calling rmpr
 2017-02-06 18:49:24 +01:00
Emile Vauge
556915cab6 Fix checkout initial before calling rmpr 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 17:50:11 +01:00
Emile Vauge
bff654b843 Merge pull request #1120 from SantoDE/feature-rancher-integration 
Feature rancher integration
 2017-02-06 17:49:38 +01:00
Manuel Laufenberg
3a875e2954 add default config 
lint files
 2017-02-06 17:03:43 +01:00
Manuel Laufenberg
bdb63ac785 add watch function 2017-02-06 17:03:43 +01:00
Manuel Laufenberg
9a5dc54f85 add some unit tests 
fmt & lint
 2017-02-06 17:03:41 +01:00
Manuel Laufenberg
48524a58ff fix all containers - no matter of pagination 
fmt & lint
 2017-02-06 17:03:38 +01:00
Manuel Laufenberg
38bd49b97e add dependency, start provider and fetch data 
add tons of labels

Provide - WIP

add rancher data over rancher types

first version of direct fetch - pagination still an issue
 2017-02-06 17:02:53 +01:00
Emile Vauge
28054a0be3 Merge pull request #1061 from WTFKr0/replace_underscores_in_url 
Replace underscores to dash in autogenerated urls (docker provider)
 2017-02-06 16:32:28 +01:00
WTFKr0
250a0863f6 Tab Lint 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
WTFKr0
b1764a6864 Adapt test to new urls 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
WTFKr0
41f8f0113b Replace underscores to dash in autogenerated urls (docker provider) 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
Emile Vauge
db63e84a9f Merge pull request #1033 from foleymic/feature-1024 
Support sticky sessions under SWARM Mode. #1024
 2017-02-06 15:23:47 +01:00
Mike Foley
e0a4c58081 Added service name to dockerData struct. 
In Swarm mode with with Docker Swarm’s Load Balancer disabled (traefik.backend.loadbalancer.swarm=false)
service name will be the name of the docker service and name will be the container task name
(e.g. whoami0.1).  When generating backend and fronted rules, we will use service name instead of name if a
rule is not provided.

Initialize dockerData.ServiceName to dockerData.Name to support non-swarm mode.
 2017-02-06 14:44:25 +01:00
Mike Foley
d2b47a5681 Support sticky sessions under SWARM Mode. 
SWARM Mode has it's own built in Load balancer, so if we want to leverage sticky sessions,
 or if we would just prefer to bypass it and go directly to the containers (aka tasks), via
	--label traefik.backend.disable.swarm.loadbalancer=true
 then we need to let Traefik know about the underlying tasks and register them as
 services within it's backend.
 2017-02-06 14:44:25 +01:00
Emile Vauge
106e5c1f92 Merge pull request #1109 from containous/fix-git-rpr-upstream 
Fix git rpr
 2017-02-06 14:40:45 +01:00
Emile Vauge
c00a9fae0c Add rmpr command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
087bbd2e3e Add cpr command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
e16f2bb23d Fix git rpr 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
8d0bacf146 Merge pull request #1098 from ddunkin/fix-k8s-example-ui 
Fix k8s example UI port.
 2017-02-06 11:06:32 +01:00
Dave Dunkin
354f69b2f6 Fix k8s example UI port. 
Port was out of sync from 495cba591f.
 2017-02-06 10:18:16 +01:00
Emile Vauge
39e6b16069 Merge pull request #918 from Juliens/httpchk 
(WIP) feat: HealthCheck
 2017-02-06 10:15:37 +01:00
Julien Salleyron
b30272d896 fix lint 2017-02-06 09:36:30 +01:00
Julien Salleyron
755822bf14 fix after review 2017-02-06 09:36:30 +01:00
Julien Salleyron
99ffc26d40 One goroutine for each backend + fix typo 2017-02-06 09:36:30 +01:00
Julien Salleyron
4a8f032304 feat: timeout on check 2017-02-06 09:36:30 +01:00
Julien Salleyron
a0b775a7c0 Lint on healthcheck 2017-02-06 09:36:30 +01:00
Julien Salleyron
0ab0bdf818 feat: HealthCheck 2017-02-06 09:36:30 +01:00
Emile Vauge
fce32ea5c7 Merge pull request #1088 from lpetre/amazon_ecs_provider 
Add an ECS provider
 2017-02-05 21:01:17 +01:00
Luke Petre
8d3c77a0b9 Add an ECS provider 2017-02-05 18:09:30 +00:00
Emile Vauge
00de73bdfc Merge pull request #1119 from containous/fix-glide-go-units 
Fix glide go units
 2017-02-05 18:59:32 +01:00
Emile Vauge
96197af3f1 Add glide hash validation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-05 17:24:14 +01:00
Emile Vauge
dacde21c27 Fix glide.yml go-units 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-05 17:24:13 +01:00