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

1729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Attilio Borello
ef339af623 added DOCKER_VERSION variable 2017-05-09 11:25:25 +02:00
Ludovic Fernandez
acc7865542 Merge pull request #1554 from ldez/feat-push-force-pr 
feat(github): push force PR branch.
 2017-05-05 17:19:30 +02:00
Fernandez Ludovic
c00c240c14 feat(github): push force contributor branch. 2017-05-05 16:19:23 +02:00
Ludovic Fernandez
3fd6da06e0 Merge pull request #1556 from atbore-phx/hf-travis 
[CI ] to run once travis before_deploy
 2017-05-05 15:19:55 +02:00
Attilio Borello
95502aeec3 hot fix for release, travis runs before_deploy for each provider! we add a condition to run once 2017-05-05 14:17:08 +02:00
Ludovic Fernandez
58c786ca8c Merge pull request #1552 from atbore-phx/new-ci 
[CI] Add SemaphoreCI
 2017-05-05 09:33:43 +02:00
Attilio Borello
b6916d2f8c added initial ci conf 2017-05-04 22:04:20 +02:00
Ludovic Fernandez
840c131a98 Merge pull request #1546 from atbore-phx/rf-travis-ci 
[CI] Enhance cross-binary builds and parallelism
 2017-05-04 21:28:10 +02:00
Attilio Borello
219bcec40f crossbinary default is now executed before deploy using multiple make jobs in parallel 2017-05-04 20:23:48 +02:00
Ludovic Fernandez
ccda550ab1 Merge pull request #1553 from containous/prepare-release-v1.3.0-rc1 
Prepare release v1.3.0-rc1
 2017-05-04 20:15:20 +02:00
Emile Vauge
b5e73cfa07
Prepare release v1.3.0-rc1 2017-05-04 18:17:54 +02:00
Emile Vauge
ba928dd459 Merge pull request #1241 from vholovko/healthcheck_changes 
using more sensible consul blocking query to detect health check changes
 2017-05-04 17:25:12 +02:00
Volodymyr Holovko
6fd40dbaa9
Using more sensible consul blocking query to detect health check changes 2017-05-04 16:54:27 +02:00
Ludovic Fernandez
6ad273b9fa Merge pull request #1542 from maxwo/working-ui 
Working UI
 2017-05-04 02:38:45 +02:00
Maxime Wojtczak
5500658f5a feat(UI) : Working UI. 
chore(Build) : Add Babel for build.
chore(Babel) : Add babel configuration.
style(Code) : Enhance code style.
 2017-05-04 01:12:46 +02:00
Ludovic Fernandez
b4f9e3890f Merge pull request #1535 from atbore-phx/crossbinary-parallel 
Makefile target to enable parallel jobs
 2017-05-04 00:47:38 +02:00
Attilio Borello
df6741aeeb Makefile target to enable parallel jobs 
- fixed dependencies order and renamed Makefile target
- extracted docker run params into DOCKER_RUN_OPTS
- crossbinary-default contains 64bit Linux, Win and Darwin
- crossbinary-others contains 32bit Linux, Win, Darwin and 32/64bit *bsd
- added dependencies to crossbinary-default and crossbinary-others targets
 2017-05-04 00:02:45 +02:00
Ludovic Fernandez
5535318cda Merge pull request #1538 from containous/merge-v1.2.3-master 
Merge v1.2.3 master
 2017-05-03 23:49:47 +02:00
Emile Vauge
4e186cecf9
Merge v1.2.3 master 2017-05-03 23:24:53 +02:00
Emile Vauge
8ac281f9e3
Prepare release v1.2.3 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-03 22:53:58 +02:00
Emile Vauge
e7a73d3fb3
Fix too many redirect 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-03 22:53:58 +02:00
Emile Vauge
ca9e36ebe3
Prepare release v1.2.2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-03 22:53:58 +02:00
Adam Geiger
138fea17ed
Fix redirect empty backend 
Issue-#679
 2017-05-03 22:53:58 +02:00
Emile Vauge
bf3f6e2029
Fix Docker filter empty rule 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-03 22:53:58 +02:00
Emile Vauge
ec245d604a
Fix postLoadConfig 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-03 22:53:58 +02:00
Emile Vauge
69e081f40f Merge pull request #1541 from containous/revert-73a1b17 
Revert "First stage of access logging middleware.  Initially without …
 2017-05-03 19:35:49 +02:00
Emile Vauge
82651985c4
Revert "First stage of access logging middleware. Initially without any output appenders." 
This reverts commit 73a1b172ed.
 2017-05-03 17:30:31 +02:00
Ludovic Fernandez
a5384bae47 Merge pull request #1540 from containous/marathon-add-tests-lost-during-1320-rebase 
Add tests lost during PR 1320.
 2017-05-03 17:15:10 +02:00
Timo Reimann
1dcf8d2ea6 Add tests lost during PR 1320. 
The tests part of this change were originally in PR 1320 but got lost
during one of the rebases. Let's bring them back in.
 2017-05-03 16:27:21 +02:00
Ludovic Fernandez
e86df016c3 Merge pull request #1537 from ldez/refactor-git-alias-safe 
refactor: fix for PR with master branch.
 2017-05-03 16:24:38 +02:00
Fernandez Ludovic
72baf746f4 refactor: fix for PR with master branch. 2017-05-03 15:54:43 +02:00
Ludovic Fernandez
91b4b47f04 Merge pull request #1523 from tanyadegurechaff/make-port-deterministic 
Make port deterministic
 2017-05-03 15:53:46 +02:00
tanyadegurechaff
79cbe56a41 Make port deterministic 2017-05-03 15:28:53 +02:00
Ludovic Fernandez
f621d7a2c4 Merge pull request #1525 from guilhem/fix-watchdog 
Fix systemd watchdog feature
 2017-05-03 15:25:15 +02:00
Guilhem Lettron
3c33eab35e Fix systemd watchdog feature 
Commit coreos/go-systemd@0c088e introduce cleaning environment.
First usage of sdnotify (for type=notify) was clearing NOTIFY_SOCKET environment variable.
sdnotify in watchdog was unable to ping back.

Fix #1353
 2017-05-03 14:44:51 +02:00
Ludovic Fernandez
b67a27d0c7 Merge pull request #1527 from yyekhlef/master 
feat(rancher): added constraint management for rancher provider
 2017-05-03 14:32:01 +02:00
Youcef Yekhlef
8de107866f feat(rancher): added constraint management for rancher provider 2017-05-03 13:48:44 +02:00
Ludovic Fernandez
b5283391dd Merge pull request #1488 from alpe/k8s-auth 
Add basic auth to kubernetes provider
 2017-05-03 13:37:05 +02:00
Fernandez Ludovic
420a6db3b4 doc: add k8s basic auth. 2017-05-03 13:18:40 +02:00
Alex Peters
89da3b15a4 Add basic auth to kubernetes provider 2017-05-03 13:18:40 +02:00
Emile Vauge
dcc4d92983 Merge pull request #1524 from jangie/update-dep-go-marathon 
[Marathon] Bump go-marathon dep
 2017-05-03 13:06:36 +02:00
Bruce Lee
12c2d398a7 retry using 'script/glide.sh update' 
fix docker dependency

remove unneeded docker dependency files

further cleanup
 2017-05-03 11:43:37 +02:00
jangie
4e238280bc [Marathon] Bump go-marathon dep 
attempt to remove glide from integration

glide trim

Revert "attempt to remove glide from integration"

This reverts commit c5b42b6cdebb44e730080a0cf20a871c11ef095b.
 2017-05-03 11:43:37 +02:00
Ludovic Fernandez
bd6056c269 Merge pull request #1534 from containous/revert-1464-vendor-autogen 
Revert "Vendor generated file"
 2017-05-03 10:40:38 +02:00
Fernandez Ludovic
acb0492e26 Merge pull request #1464 from vdemeester/vendor-autogen 2017-05-03 10:02:14 +02:00
Emile Vauge
a0d6594e99 Merge pull request #1464 from vdemeester/vendor-autogen 
Vendor generated file
 2017-05-01 19:07:15 +02:00
Vincent Demeester
65f81990a7
Update script to use /usr/bin/env bash… 
… instead of /bin/bash, to work better on more platforms.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-01 18:32:40 +02:00
Vincent Demeester
1b85dd0455
Vendor generated file 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-01 18:32:40 +02:00
Emile Vauge
bec45bc7d6 Merge pull request #1516 from ldez/refactor/documentation-review 
doc: small documentation review
 2017-05-01 18:32:20 +02:00
Fernandez Ludovic
4c4b05d024 refactor: small documentation review 2017-05-01 18:09:22 +02:00