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

4799 commits

This branch
This branch
All branches
Author SHA1 Message Date
Attilio Borello
33404a7772 added retry function to tests script 2017-05-12 17:18:47 +02:00
Ludovic Fernandez
bd90745528 Merge pull request #1593 from atbore-phx/ci-switch 
[CI] removed unit and integration tests from travis
 2017-05-12 17:17:00 +02:00
Attilio Borello
ede1212cb0 removed unit and integration tests from travis 2017-05-12 16:19:35 +02:00
Ludovic Fernandez
2dcbc01e51 Merge pull request #1544 from maxwo/proxy-dev-mode 
Proxy in dev mode
 2017-05-12 10:11:58 +02:00
Maxime Wojtczak
61ba50fac9 feat(Dev proxy) : Add proxy to localhost:8080 in dev mode. 2017-05-12 09:41:22 +02:00
Ludovic Fernandez
b24b5e20b4 Merge pull request #1548 from timoreimann/kubernetes-ignore-missing-pass-host-header-annotation 
Merge v1.3 branch into master [2017-05-11]
 2017-05-12 00:36:52 +02:00
Emile Vauge
ffe1104851 Merge pull request #1588 from containous/fix-exported-fields-providers 
Fix exported fields providers
 2017-05-11 22:58:00 +02:00
Timo Reimann
3112432480 Merge remote-tracking branch 'upstream/v1.3' into HEAD 2017-05-11 21:10:20 +02:00
Emile Vauge
aa4ed088bb
Unexport Kvclient & StoreType from kv Provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-11 19:33:32 +02:00
Emile Vauge
3a4ec19817
Add missing description tag 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-11 19:33:32 +02:00
Timo Reimann
d2b204a075 Merge pull request #1581 from timoreimann/1-3-kubernetes-ignore-missing-pass-host-header-annotation 
[Kubernetes] Ignore missing pass host header annotation. [v1.3 - CHERRY-PICK]
 2017-05-11 17:43:14 +02:00
Ludovic Fernandez
94f5b0d9ff Merge pull request #1571 from containous/restore-access-logger 
Restore: First stage of access logging middleware.
 2017-05-11 17:24:26 +02:00
Fernandez Ludovic
d2c8824902 refactor: restore "First stage of access logging middleware." 
This reverts commit 82651985c4.
 2017-05-11 16:27:13 +02:00
Timo Reimann
fe6c35bc6b [Kubernetes] Ignore missing pass host header annotation. 
A missing annotation would previously be handled in the default error
case, causing a noisy warning-level log message to be generated each
time.

We add another case statement to ignore the case where the annotation is
missing from the annotations map.

Also piggybacking a minor improvement to the log message.
 2017-05-10 19:32:45 +02:00
Ludovic Fernandez
db09007dbc Merge pull request #1558 from Stibbons/yarnpkg 
prefere yarnpkg over yarn
 2017-05-10 18:26:05 +02:00
Gaetan Semet
5b2e8990f1 prefere yarnpkg over yarn 
to avoid conflict with Hadoop Yarn cli.

I don’t know the best practice, but i do
have Apache Yarn installed on my machine, so
I get this conflict. Of course this conflict does
not arised when building within the docker.

https://github.com/yarnpkg/yarn/issues/2337
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2017-05-10 17:35:17 +02:00
Ludovic Fernandez
2f6068decc Merge pull request #1580 from atbore-phx/docker-light 
[CI] Reduce size of Docker Images
 2017-05-10 17:23:37 +02:00
Attilio Borello
1e591dd188 clean up apt-cache in webui/Dockerfile 2017-05-10 11:24:19 +02:00
Attilio Borello
6838a81e50 replaced docker images with alpine if available (nginx, rabbitmq) 2017-05-10 11:24:19 +02:00
Ludovic Fernandez
ceef5e39b7 Merge pull request #1572 from atbore-phx/ci-docker-version 
[CI] set Docker version
 2017-05-09 16:04:08 +02:00
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