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

5162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Guilhem Lettron
d324040adc Add systemd watchdog feature 2017-02-04 19:06:24 +01:00
Emile Vauge
da5eba17d8 Merge pull request #1113 from StefanScherer/fix-docker-api-version-for-windows 
Fix Docker API version for Windows
 2017-02-04 17:26:05 +01:00
Stefan Scherer
434596b103 Fix Docker API version for Windows 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2017-02-04 16:44:10 +01:00
Emile Vauge
71a185c70e Merge pull request #1090 from diegooliveira/IP-Per-Task-Fix 
Fix marathon provider
 2017-02-04 16:41:49 +01:00
Diego de Oliveira
cbbb5f4ccb Fix marathon provider 
The IP-Per-Task PR introduced a bug using the marathon application
port mapping. This port should be used only in the proxy server, the
downstream connection should be always made with the task port.

    This commit fix the regression and adds a unit test to prevent new
problems in this setup.
 2017-02-04 16:05:35 +01:00
Vincent Demeester
89ec25f718 Merge pull request #1084 from JamesKyburz/feature/fix-gzip-for-websockets 
update NYTimes/gziphandler fixes #1059
 2017-02-04 16:02:39 +01:00
Emile Vauge
e5b688214c Merge branch 'master' into feature/fix-gzip-for-websockets 2017-02-04 15:18:22 +01:00
Brian Akins
225dbcce0a Allow setting circuitbreaker expression via Kubernetes annotation (#1056) 2017-02-03 17:47:48 +01:00
Vincent Demeester
b22dc213e8 Merge pull request #1080 from jangie/only-add-marathon-balancees-if-any-healthcheck-results 
Ensure that we don't add balancees with no health check runs if there is a health check defined on it
 2017-02-03 15:55:23 +01:00
Bruce Lee
ad12a7264e Ensure that we don't add balancees with no health check runs if there is a health check defined on it 
Change test behavior
 2017-02-03 08:45:15 -05:00
Vincent Demeester
29059b77a8 Merge pull request #1078 from geoffgarside/release-build-bsd 
Add FreeBSD & OpenBSD to crossbinary
 2017-02-03 13:50:39 +01:00
Geoff Garside
cdaa64a4b2 Add OpenBSD to script/crossbinary 2017-02-03 12:02:20 +01:00
Geoff Garside
bc4296729f Add FreeBSD to script/crossbinary 2017-02-03 12:02:20 +01:00
Vincent Demeester
3a3630f3ef Merge pull request #1102 from bamarni/patch-3 
[doc] typo fixes for kubernetes user guide
 2017-02-03 12:01:49 +01:00
Bilal Amarni
93ce747205 [doc] typo fixes for kubernetes user guide 2017-02-03 11:08:38 +01:00
Vincent Demeester
1493a4c815 Merge pull request #1105 from containous/merge-v1.1.2-master 
Merge v1.1.2 master
 2017-02-03 10:44:28 +01:00
Emile Vauge
54be6beaab
Lint files 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:55:47 +01:00
Emile Vauge
e9fc9fdf12
Prepare release v1.1.2 2017-02-03 09:47:23 +01:00
Emile Vauge
ba4670eddc
Fix duplicate acme certificates 2017-02-03 09:47:23 +01:00
Emile Vauge
5a67d0ac84
Fix panic in k8s loadIngresses 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:46:27 +01:00
Emile Vauge
be362f0d9f
Add Operation with recover 2017-02-03 09:46:27 +01:00
Emile Vauge
a394e6a3e3
Manage acme cert in infinit channels 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:45:39 +01:00
Emile Vauge
1a5f1977c4
Fix safe panic 2017-02-03 09:41:41 +01:00
Emile Vauge
feee8ad72e
Fix redirect regex 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:41:41 +01:00
Timo Reimann
c9e78c4f4a Fix docker version specifier (#1108) 
* Fix Docker version specifier.

- The download URL[1] does not contain a leading 'v'.
- The major version is 1.

[1] https://github.com/docker/docker/releases/tag/v1.10.3

* Drop -S and and -f in build.Dockerfile curl commands.

- `-f` (`--fail`) turns HTTP error response codes into a non-zero exit
  code, making curl fail early and properly. While the documentation
  mentions that there is supposed to be no output, we do see an error
  message.
- `-S` (`--show-error`) is only meaningful when used together with `-s`
  (`--silent`). We do not want to go silent but see the progress bar
  though.
 2017-02-03 09:15:56 +01:00
Emile Vauge
d0e2349dfd Merge pull request #1016 from bamarni/issue-1008 
Set a NopCloser request body with retry middleware
 2017-02-02 19:13:43 +01:00
James Kyburz
d516cbfe6c
update NYTimes/gziphandler fixes #1059 2017-02-02 17:56:07 +01:00
Bilal Amarni
86fd5b4c97
Set a NopCloser request body with retry middleware 
As the http client always closes the request body,
this makes sure the request can be retried if needed.

Fixes #1008
 2017-02-02 17:24:49 +01:00
Emile Vauge
1131a972cd Merge pull request #1103 from containous/fix-travis-script-again-again 
add sh before script in deploy...
 2017-02-02 17:24:01 +01:00
Emile Vauge
2048f77178 add sh before script in deploy... 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-02 16:19:09 +01:00
Emile Vauge
a70c6f25ea Merge pull request #1068 from bakins/kubernetes-loadbalancer-annotations 
Allow setting load balancer method and sticky using service annotations
 2017-02-02 16:15:50 +01:00
Brian Akins
490427f94d
Allow setting load balancer method and sticky using service annotations 2017-02-02 14:03:39 +00:00
Emile Vauge
7cc91a8244 Merge pull request #1101 from containous/fix-travis-script-again 
add skip_cleanup in deploy
 2017-02-02 14:35:27 +01:00
Emile Vauge
4f951a242b
add skip_cleanup in deploy 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-02 13:59:28 +01:00
Matevz Mihalic
c095fc1eab Fix metrics for multiple entry points (#1071) 2017-02-02 12:34:00 +01:00
Emile Vauge
c1182377db Fix travis script (#1067) 
* Fix travis script

Signed-off-by: Emile Vauge <emile@vauge.com>

* how do i pronounce this damn project

Signed-off-by: Emile Vauge <emile@vauge.com>

* Remove unstable Docker 1.13 tests

Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-02 10:58:42 +01:00
Nicolas Pouillard
02473328e7 Update comment to reflect the code (#1087) 2017-01-31 15:28:40 +01:00
Emile Vauge
2b00cdf330 Fix k8s example (#1062) 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-01-30 13:04:32 +01:00
Emile Vauge
18cf49755e Merge pull request #1066 from timoreimann/patch-1 
Add missing fmt verb specifier in k8s provider.
 2017-01-26 14:50:50 +01:00
Timo Reimann
3a7de0be5c Add missing fmt verb specifier in k8s provider. 2017-01-26 11:05:13 +01:00
Emile Vauge
a1b610ee03 Merge pull request #1063 from containous/add-git-rpr 
Add git rpr command
 2017-01-24 21:30:27 +01:00
Emile Vauge
4d99b84e5b
Add git rpr command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-01-24 18:38:53 +01:00
Emile Vauge
e20d13c44e Merge pull request #1041 from twelvelabs/patch-1 
Update user guide for upcoming `docker stack deploy`
 2017-01-24 16:45:11 +01:00
Skip Baney
18e9064d25
Add link to GH issue for docker stack deploy 2017-01-24 14:49:28 +01:00
Emile Vauge
fad3038df2 Merge pull request #843 from guilhem/travis_deploy 
Use deployment primitives from travis
 2017-01-24 13:01:19 +01:00
Guilhem Lettron
8e4c4f8407 Use deployment primitives from travis 2017-01-23 15:52:28 +01:00
Vincent Demeester
68bd24d065 Don't run go test on .glide cache folder 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-23 15:43:24 +01:00
Adam Stankiewicz
d15a17b634 Allow for wildcards in k8s ingress host, fixes #792 (#1029) 2017-01-20 14:16:05 +01:00
Alberto
fa1090b6eb Improving instrumentation. (#1042) 2017-01-17 18:14:13 +01:00
Manuel Laufenberg
483ef486af Merge pull request #1022 from enxebre/prometheus 
Add commit prometheus middleware v1.
 2017-01-16 15:40:06 +01:00