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

1213 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Reimann 2a61c9049f Merge pull request #1257 from benoitf/docker-services 
Allow multiple rules from docker labels containers with traefik.<servicename>.* properties
 2017-03-14 10:31:58 +01:00
Florent BENOIT 1158eba7ac Adding docker labels traefik.<servicename>.* properties like 
- traefik.mycustomservice.port=443
  -  traefik.mycustomservice.frontend.rule=Path:/mycustomservice
   - traefik.anothercustomservice.port=8080
  -  traefik.anothercustomservice.frontend.rule=Path:/anotherservice

all traffic to frontend /mycustomservice is redirected to the port 443 of the container while using /anotherservice will redirect to the port 8080 of the docker container

More documentation in the docs/toml.md file

Change-Id: Ifaa3bb00ef0a0f38aa189e0ca1586fde8c5ed862
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
 2017-03-14 08:45:47 +01:00
Emile Vauge 22c5bf7630 Merge pull request #1273 from timoreimann/rpr-force-with-lease 
.github/rpr.sh: Use --force-with-lease instead of --force.
 2017-03-11 11:36:37 +01:00
Timo Reimann 4148266ed0 .github/rpr.sh: Use --force-with-lease instead of --force. 
This prevents accidentally overriding a branch that has been changed
remotely by another party.
 2017-03-10 21:32:34 +01:00
Timo Reimann 6e8e597ff5 Merge pull request #1189 from krancour/usersfile 
Allow usersFile to be specified for basic or digest auth
 2017-03-10 07:45:39 +01:00
Kent Rancourt 7357417f48 Allow usersFile to be specified for basic or digest auth 2017-03-09 20:24:44 -05:00
Timo Reimann 91bf627275 Merge pull request #1144 from timoreimann/vendor-dependencies 
Vendor dependencies.
 2017-03-09 16:23:26 +01:00
Timo Reimann 55b57c736b Vendor integration dependencies. 2017-03-09 13:13:03 +01:00
Timo Reimann dd5e3fba01 Vendor main dependencies. 2017-03-09 13:13:02 +01:00
Timo Reimann 49a09ab7dd Prepare for dependency vendoring. 
- Add helper script to simplify glide usage.
- Add validation script for unwanted changes to vendoring.
- Relax/tighten up .{git,docker}ignore to cover vendored files properly.
- .validate: Protect from unbound variable in case of nounset setting.
- Install more recent hg version in the build container.
- Remove glide installation steps from Dockerfile.
- Update documentation.
 2017-03-08 22:21:12 +01:00
Emile Vauge dae28f7f17 Merge pull request #1227 from dtomcej/tighter-regex 
Tighten regex match for wildcard certs [Addendum to #1018]
 2017-03-07 16:59:52 +01:00
Daniel Tomcej 9cd76f122e
remove dot from regex 2017-03-07 15:21:08 +01:00
Timo Reimann 920b5bb15d Support cluster-external Kubernetes client. (#1159) 
Detect whether in-cluster or cluster-external Kubernetes client should
be used based on the KUBERNETES_SERVICE_{HOST,PORT} environment
variables.

Adds bearer token and CA certificate file path parameters.
 2017-03-07 13:09:11 +01:00
Emile Vauge 3611818eda Add @trecloux to Maintainers (#1226) 2017-03-07 00:38:44 +01:00
Emile Vauge 7d83027954 Merge pull request #1208 from containous/merge-v1.2.0-rc2-master 
Merge v1.2.0 rc2 master
 2017-03-06 18:37:03 +01:00
Emile Vauge ea190b6898
Prepare release v1.2.0-rc2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-06 17:45:58 +01:00
Bruce Lee aa75d5458d
Revert "Ensure that we don't add balancees with no health check runs if there is a health check defined on it" 
This reverts commit ad12a7264e.
 2017-03-06 17:45:58 +01:00
Christophe Robin 4172a7c62e
Add task parser unit test for docker provider 2017-03-06 17:45:58 +01:00
Christophe Robin 355b4706d3
Fix docker issues with global and dead tasks 2017-03-06 17:45:58 +01:00
Manuel Laufenberg eb1ffae01b
Small fixes and improvments 2017-03-06 17:45:58 +01:00
Emile Vauge cc0733a4fa
Fix stats race condition 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-06 17:45:58 +01:00
Luke Petre c786bbbc5b
Try harder to query all the possible ec2 instances, and filter on instance state / lack of IP address 2017-03-06 17:45:58 +01:00
Julien Salleyron f87b1c2fcd
Wrong tests docker images 2017-03-06 17:45:58 +01:00
Julien Salleyron 14fd53c915
Add doc 2017-03-06 17:45:58 +01:00
Julien Salleyron aa2edcc6e5
Add some integration test 2017-03-06 17:45:58 +01:00
Julien Salleyron 6b6f010851
Add healthcheck interval 2017-03-06 17:45:58 +01:00
Rickard von Essen 5e8805f24d
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-03-06 17:45:58 +01:00
Emile Vauge 3848944d35
Fix travis deploy 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-06 17:45:58 +01:00
Emile Vauge 9d7df45b7c
Changelog for v1.2.0-rc1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-06 17:45:58 +01:00
Emile Vauge 7a164ed401
Add v1.2 codename 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-06 17:45:57 +01:00
Regner Blok-Andersen f530284031 Adding support for Traefik to respect the K8s ingress class annotation (#1182) 2017-03-03 20:30:22 +01:00
Timo Reimann 38c0cf7007 Merge pull request #1151 from timoreimann/refactor-k8s-rule-type-annotation-logic 
Refactor k8s rule type annotation parsing/retrieval.
 2017-03-03 18:48:59 +01:00
Timo Reimann f3598e6b0f Refactor k8s rule type annotation parsing/retrieval. 
- Move annotation logic into function.
- Constantify strings.
- Refactor TestRuleType.
- Add test for GetRuleTypeFromAnnotations.
 2017-03-03 13:33:00 +01:00
Vincent Demeester 291ca860af Merge pull request #1216 from timoreimann/elaborate-on-regexp 
Motivate and explain regular expression rules.
 2017-03-03 10:09:30 +01:00
Timo Reimann 7d20871f0d Fix typos. 2017-03-03 00:27:33 +01:00
Timo Reimann 6942b063ee Motivate and explain regular expression rules. 2017-03-02 23:00:25 +01:00
Timo Reimann e56bd27c1e Remove blank space. 2017-03-02 23:00:25 +01:00
Timo Reimann a3beec6b9c Merge pull request #1214 from timoreimann/avoid-validate-glide-output-suppression 
Evaluate glide-hash result without reading $?.
 2017-03-02 23:00:01 +01:00
Timo Reimann 04a1ecc4f4 Evaluate glide-hash result without reading $?. 
validate-glide is called with errexit enabled (in script/make.sh that
sources validate-glide), which means that grep returning a non-zero exit
code will cause the script to terminate prematurely. Thus, we will never
get to the point where we see the error message.

The fix is to embed the grep check directly inside the if statement.
 2017-03-02 18:49:13 +01:00
Manuel Laufenberg 7707814f2e Merge pull request #1215 from timoreimann/add-timoreimann-to-maintainer-list 
Add @timoreimann to list of maintainers.
 2017-03-02 17:59:00 +01:00
Timo Reimann 4d4f2b62aa Add @timoreimann to list of maintainers. 2017-03-02 02:00:53 +01:00
Emile Vauge 5abffe402f Merge pull request #1194 from timoreimann/example-ip-addr-binding 
Add Traefik TOML sample section on how to bind to specific IP addr.
 2017-02-28 09:57:23 +01:00
Timo Reimann 38ec32a146 Add Traefik TOML sample section on how to bind to specific IP addr. 2017-02-25 21:44:01 +01:00
Vincent Demeester d77ad42326 Merge pull request #1149 from Regner/kubernetes-support-externalname-service 
Kubernetes support externalname service
 2017-02-22 10:52:35 +01:00
Regner Blok-Andersen 4106f0fa9e Merge branch 'master' into kubernetes-support-externalname-service 2017-02-21 16:19:01 -08:00
Vincent Demeester a0a0bf0577 Merge pull request #1170 from timoreimann/upgrade-go-marathon-to-v0.7.0 
Upgrade dependencies.
 2017-02-21 20:45:22 +01:00
Regner Blok-Andersen 71c7920d0f Merge branch 'master' into kubernetes-support-externalname-service 2017-02-21 10:02:34 -08:00
Timo Reimann 9bb1b01742 Upgrade dependencies. 
Brings github.com/gambol99/go-marathon version 0.7.1.
 2017-02-21 16:10:45 +01:00
Vincent Demeester 8c824680ce Merge pull request #1157 from solidnerd/fix-prometheus-in-traefik-example-toml 
Fix prometheus metrics example
 2017-02-21 09:52:27 +01:00
solidnerd 60b3f74be8 Fix prometheus metrics example 
Traefik won’t start correctly if heterogeneous numbers in a toml array.  This commit makes all numbers homogene.

Signed-off-by: solidnerd <niclas@mietz.io>
 2017-02-21 07:55:50 +01:00