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

1060 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3db6e185e0 Add Nvd3 Dependency to fix UI / Dashboard 2016-11-11 21:50:59 +01: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
4430befe90 Merge pull request #823 from containous/fix-mkdoc-theme 
Fix mkdoc theme
 2016-11-10 12:20:46 +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
Emile Vauge
1c4eb4322b
Fix changelog 2016-11-10 11:15:42 +01:00
Emile Vauge
3f3fa61a51
Fix mkdocs theme 2016-11-10 11:12:54 +01:00
Emile Vauge
ddf24039e8 Merge pull request #822 from containous/prepare-release-v1.1.0-rc4 
Prepare release v1.1.0 rc4
 2016-11-10 10:40:36 +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
Emile Vauge
5b6a5f8aa9
Changelog v1.1.0-rc4 2016-11-09 22:00:10 +01:00
Emile Vauge
3e6d2391f7
Add dtomcej, SantoDE remove samber from maintainers 2016-11-09 21:59:58 +01:00
Emile Vauge
664ee9d82f Merge pull request #814 from containous/fix-acme-renew 
Fix multiple issues
 2016-11-09 21:47:13 +01:00
Emile Vauge
c9cc3c9895
Fix contraint store/read from KV 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-09 21:08:37 +01:00
Emile Vauge
00c7e5c72b
Ensure HTTP/2 enabled 2016-11-09 17:56:41 +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
Emile Vauge
558b31f4d9
Fix oxy version 2016-11-08 10:34:39 +01:00
Emile Vauge
174a5e7f13
Fix ACME renew 2016-11-07 21:51:23 +01:00
djalal
952fcf5d09 fix typos 2016-11-05 23:02:43 +01:00
Emile Vauge
c821f191b0 Merge pull request #783 from containous/add-version-check 
Fix ACME renew & add version check
 2016-11-03 14:14:06 +01:00
Emile Vauge
3322e564fd
Add version check 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-03 11:30:00 +01:00
Emile Vauge
7bf5d557c1
Fix acme renew 2016-11-03 11:30:00 +01:00
Vincent Demeester
0c1e06199c Merge pull request #782 from guilhem/defaultToIndex1 
Use first port by default
 2016-11-02 14:34:42 -07:00
Guilhem Lettron
85a20b9a39 Use first index for ports 2016-11-02 17:31:27 +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
Guilhem Lettron
5641af437e Use first port by default 
If no information is given, use first index of ports
 2016-10-28 11:59:24 +02:00
Guilhem Lettron
1c8d3ded3d Add name to some case to help debug 2016-10-28 11:59:24 +02:00
Emile Vauge
c2a445370e Merge pull request #779 from containous/prepare-release-v1.1.0-rc3 
Prepare release v1.1.0-rc3
 2016-10-26 17:59:09 +02:00
Emile Vauge
8e5355f2d9
Prepare release v1.1.0-rc3 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-26 17:38:18 +02:00
Emile Vauge
2492157833 Merge pull request #776 from containous/fix-response-recorder-flush 
Fix ResponseRecorder Flush
 2016-10-26 17:00:49 +02:00
Emile Vauge
7c375e8fd9
Fix ResponseRecorder Flush 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-26 16:26:19 +02:00
Emile Vauge
53b5d8ac33 Merge pull request #758 from containous/fix-multiple-certs-flag 
Fix multiple certificates using flag
 2016-10-26 16:23:06 +02:00
Emile Vauge
e5a8fb390e
Fix multiple certificates using flags 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-26 15:40:27 +02:00
Emile Vauge
79cbae0c73 Merge pull request #759 from containous/fix-mapstructure-slice 
Fix mapstructure issue with anonymous slice
 2016-10-26 15:39:45 +02:00
Emile Vauge
22b0b8b750
Fix mapstructure issue with anonymous slice 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-10-26 15:17:54 +02:00
Emile Vauge
ddbddf6edf Merge pull request #760 from containous/fix-ProvidersThrottleDuration-doc 
Fix providers throttle duration doc
 2016-10-26 14:20:10 +02:00
Emile Vauge
adcf58da68
Fix ProvidersThrottleDuration doc 2016-10-26 12:47:19 +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
Guilhem Lettron
649cb548d0 Use sdnotify for systemd (#768) 
* Use sdnotify for systemd

This is useful if a configuration is long to load.
Systemd will continue dependency chain only when server have finish to start.

https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=

* Extract the waiting behavior from Start()
 2016-10-25 08:59:39 -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
Vincent Demeester
870f378782 Merge pull request #748 from containous/really-fix-deploy-ghr 
Really fix deploy ghr...
 2016-10-19 12:14:54 +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