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

935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ed Robinson
422aacf8e6 Merge pull request #716 from jangie/allow-connection-timeout-configuration 
Allow specification of dialertimeout
 2016-11-15 21:38:53 +00:00
Bruce Lee
e068ee09ca Allow specification of dialertimeout 
Address documentation comments
 2016-11-14 10:57:46 -05:00
Manuel Laufenberg
91e3bdff48 Merge pull request #827 from errm/remove-versions-from-examples 
Remove version numbers from examples
 2016-11-14 11:45:27 +01:00
Ed Robinson
4299d1526b
Remove version numbers from examples 
Fixes #808
 2016-11-14 09:13:09 +00:00
Manuel Laufenberg
8d9caaec71 Merge pull request #789 from wallies/master 
Add marathon tls options to documentation
 2016-11-13 11:35:00 +01:00
Cam Parry
91634d5c1c
Add marathon tls options to documentation 2016-11-13 19:11:36 +10:00
Vincent Demeester
f5463c3d38 Merge pull request #788 from TerraTech/fix_makefile 
Makefile: Strip 'heads/' from git rev-parse --abbrev-ref HEAD
 2016-11-12 13:29:47 +01:00
TerraTech
73b70393d4 Makefile: Strip 'heads/' from git rev-parse --abbrev-ref HEAD 
git rev-parse --abbrev-ref HEAD can return results in a couple different ways:
  1) tag v1.1.0-rc3 exists and branch==v1.1.0-rc3
     result: heads/v1.1.0-rc3
  2) tag v1.1.0-rc3 doesn't exist and branch==v1.1.0-rc3
     result: v1.1.0-rc3

  Strip it off GIT_BRANCH regardless as it will break the build.  e.g.

  $ make binary
  docker build  -t "traefik-dev:heads/v1.1.0-rc3" -f build.Dockerfile .
  invalid value "traefik-dev:heads/v1.1.0-rc3" for flag -t: Error parsing reference: "traefik-dev:heads/v1.1.0-rc3" is not a valid repository/tag
  See 'docker build --help'.
  Makefile:51: recipe for target 'build' failed
  make: *** [build] Error 125
 2016-11-11 16:22:51 -05:00
Manuel Laufenberg
d174ed75c7 Merge pull request #787 from SirCAS/contribute-guide 
Added note for how to avoid running vendor tests
 2016-11-10 19:34:28 +01:00
Christoffer Illum Søndergaard
513d261f10 Added note for how to avoid running vendor tests 2016-11-10 19:05:52 +01:00
Emile Vauge
acf425b6cf Merge pull request #817 from gomes/master 
Marathon ExposedByDefault is true by default
 2016-11-10 11:34:00 +01:00
Diogo Gomes
98b35affd5 Merge branch 'master' into master 2016-11-09 22:04:56 -02:00
Manuel Laufenberg
b3cc1e1af1 Merge pull request #806 from djalal/patch-2 
fix typos
 2016-11-09 23:09:29 +01:00
Diogo Gomes
2b770ae2f8 Actually the current Marathon default for exposedByDefault is true, as 
…
we can see in
https://github.com/containous/traefik/blob/master/configuration.go
“defaultMarathon.ExposedByDefault = true”
 2016-11-08 11:20:50 -02:00
djalal
952fcf5d09 fix typos 2016-11-05 23:02:43 +01:00
Vincent Demeester
931a124349 Merge pull request #786 from guybrush/doc-basics-frontends 
Fix typo in docs
 2016-11-02 07:39:20 +01:00
Patrick Pfeiffer
ab52f4d91d Fix typo in docs 2016-10-30 13:21:43 +01:00
Vincent Demeester
f3182ef29b Merge pull request #761 from nathan-osman/errors-in-health 
Errors in health
 2016-10-28 17:52:52 +02:00
Nathan Osman
05f6b79e29
Add optional statistics to API and web UI. 
A new option (--web.statistics) enables the collection of some basic
information about requests and responses. This currently consists of
the most recent 10 requests that resulted in HTTP 4xx or 5xx errors.
 2016-10-25 15:36:23 -07:00
Emile Vauge
14db2343c9 Merge pull request #773 from containous/merge-v1.1.0-rc2 
Merge v1.1.0 rc2
 2016-10-25 09:04:07 +02:00
Emile Vauge
67eb0c8de0
Merge tag 'v1.1.0-rc2' into master 2016-10-24 21:38:42 +02:00
Emile Vauge
82a58010f5
Really fix deploy ghr... 2016-10-19 11:49:24 +02:00
Emile Vauge
f652c58367 Merge pull request #742 from containous/fix-deploy-ghr 
Fixes deploy ghr
 2016-10-19 10:56:54 +02:00
Emile Vauge
468d138be7
Fixes deploy ghr 2016-10-17 23:42:22 +02:00
Emile Vauge
f409d2f435 Merge pull request #740 from containous/prepare-v1.1.0-rc2 
prepare v1.1.0-rc2
 2016-10-17 19:38:23 +02:00
Emile Vauge
5780a17794
prepare v1.1.0-rc2 2016-10-17 19:14:49 +02:00
Hans Kristian Flaatten
9b765d23fa Update Kubernetes examples (#731) 
* Set `hostNetwork` to `true` in Kubernetes deployment example

* Remove duplicate Kubernetes examples

* Update Kubernetes Træfik Docker Image to 1.1.0
 2016-10-17 18:36:32 +02:00
Vincent Demeester
4476861d9f Merge pull request #733 from containous/fix-case-sensitive-hosts 
Fix case sensitive host
 2016-10-17 15:44:09 +02:00
Emile Vauge
e12ddca1a5
Fix case sensitive host 2016-10-17 13:52:29 +02:00
Emile Vauge
084d00a156 Merge pull request #728 from containous/fix-marathon-dots-ID 
fIx marathon template with dots in ID
 2016-10-13 16:23:00 +02:00
Emile Vauge
404a73a712
fIx marathon template with dots in ID 2016-10-13 15:33:23 +02:00
Vincent Demeester
3b2410d904 Merge pull request #720 from guilhem/marathon-lb 
Add basic compatibility with marathon-lb
 2016-10-12 20:47:38 +02:00
Guilhem Lettron
bd5009058b Merge branch 'v1.1' into marathon-lb 2016-10-12 15:51:41 +02:00
Emile Vauge
d3f79c7ad3 Merge pull request #724 from vincentlepot/fix_network_label_service 
Fix networkMap construction in ListServices
 2016-10-10 17:16:09 +02:00
Guilhem Lettron
3f65503a79 Add basic compatibility with marathon-lb 
Add compatibility with labels: `HAPROXY_GROUP` and `HAPROXY_0_VHOST`.
* `HAPROXY_GROUP` become a new tag
* `HAPROXY_0_VHOST` become a rule `Host:`

https://github.com/mesosphere/marathon-lb
 2016-10-07 19:30:16 +02:00
Vincent Lepot
6ac1216f8c Fix networkMap construction (pointer always reference the last network found) 2016-10-07 16:44:33 +02:00
Vincent Demeester
1cae35f96b Merge pull request #713 from oscerd/readme-fix 
Remove duplicated link to Kubernetes.io in README.md
 2016-10-07 11:20:16 +02:00
Andrea Cosentino
0d13e91a62 Remove duplicated link to Kubernetes.io in README.md 2016-10-07 08:13:06 +02:00
Emile Vauge
b1b600e09e Merge pull request #715 from vdemeester/update-docs-for-swarmmode 
Add documentation for Træfik on docker swarm mode
 2016-10-06 16:34:24 +02:00
Vincent Demeester
3692e1c4bd
Add documentation for Træfik on docker swarm mode 
Also small update on the swarm one.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-06 15:48:23 +02:00
Emile Vauge
dcbd82ac3b Merge pull request #717 from containous/update-README 
Add Ed's video at ContainerCamp
 2016-10-06 15:18:26 +02:00
Emile Vauge
d4f0541027
Fix mailgun/manners push force... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-06 14:58:49 +02:00
Emile Vauge
a30d8e7819
Add Ed's video at ContainerCamp 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-06 12:24:52 +02:00
Emile Vauge
8ee6bf044a Merge pull request #708 from vdemeester/docker-support-healthcheck 
Add support for docker healthcheck 👼
 2016-10-03 12:44:38 +02:00
Emile Vauge
6632247c9c Merge pull request #709 from vhf/webui-show-version 
Show current version in web UI
 2016-10-03 11:37:20 +02:00
Vincent Demeester
d68389dc52
Add support for docker healthcheck 
- React to health_status events
- Filter container that have a health status *and* that are not healthy

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-03 11:01:37 +02:00
Victor Felder
4a43273ee5 Show current version in web UI 2016-10-02 20:46:10 +02:00
Vincent Demeester
66f52a6e21 Merge pull request #707 from billglover/master 
Fix syntax in Swarm example. Resolves #528
 2016-10-02 14:00:34 +02:00
Bill Glover
640bfc4eff Fix syntax in Swarm example. Resolves #528 
Prior to this fix the documentation for the swarm example included
syntax that would fail with the following error.

`Error : flag needs an argument: --docker.domain`

This fix specifies flags using the `=` between the flag name and value.

Tested on: Docker version 1.12.2-rc1, build 45bed2c, experimental
 2016-10-01 22:37:15 +01:00
Emile Vauge
408ef0f5b7 Merge pull request #705 from containous/prepare-release-v1.1.0-rc1 
Prepare release v1.1.0 rc1
 2016-09-30 15:57:09 +02:00