Compare commits

..

7 Commits
v1.2.2 ... v1.2

Author SHA1 Message Date
mmatur
cf31e02b9c feat: add dockerfile for documentation 2021-10-05 10:28:50 +02:00
Fernandez Ludovic
2ac217c741 doc: fix version in requirements.txt 2018-08-06 17:02:09 +02:00
Michael
bc875d6268 [doc] fix version in requirements.txt
To be able to generate versionned documentation
2018-01-19 15:46:22 +01:00
Emile Vauge
bbb8d922fc Merge pull request #1435 from containous/prepare-release-v1.2.3
Prepare release v1.2.3
2017-04-13 21:09:40 +02:00
Emile Vauge
37b44cc706 Prepare release v1.2.3
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-04-13 20:06:25 +02:00
Emile Vauge
3c6e0b3e68 Merge pull request #1433 from containous/fix-too-many-redirects
Fix too many redirect
2017-04-13 20:04:34 +02:00
Emile Vauge
e21feae561 Fix too many redirect
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-04-13 17:59:24 +02:00
4 changed files with 24 additions and 9 deletions

View File

@@ -1,5 +1,12 @@
# Change Log
## [v1.2.3](https://github.com/containous/traefik/tree/v1.2.3) (2017-04-13)
[Full Changelog](https://github.com/containous/traefik/compare/v1.2.2...v1.2.3)
**Merged pull requests:**
- Fix too many redirect [\#1433](https://github.com/containous/traefik/pull/1433) ([emilevauge](https://github.com/emilevauge))
## [v1.2.2](https://github.com/containous/traefik/tree/v1.2.2) (2017-04-11)
[Full Changelog](https://github.com/containous/traefik/compare/v1.2.1...v1.2.2)

10
docs.Dockerfile Normal file
View File

@@ -0,0 +1,10 @@
FROM alpine:3.7
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/bin
COPY requirements.txt /mkdocs/
WORKDIR /mkdocs
VOLUME /mkdocs
RUN apk --no-cache --no-progress add py-pip \
&& pip install --user -r requirements.txt

View File

@@ -1,3 +1,3 @@
mkdocs>=0.16.1
pymdown-extensions>=1.4
mkdocs-bootswatch>=0.4.0
mkdocs>=0.16.1,<0.17.0
pymdown-extensions==1.4
mkdocs-bootswatch==0.4.0

View File

@@ -554,12 +554,10 @@ func (server *Server) buildEntryPoints(globalConfiguration GlobalConfiguration)
func (server *Server) loadConfig(configurations configs, globalConfiguration GlobalConfiguration) (map[string]*serverEntryPoint, error) {
serverEntryPoints := server.buildEntryPoints(globalConfiguration)
redirectHandlers := make(map[string]negroni.Handler)
backends := map[string]http.Handler{}
backendsHealthcheck := map[string]*healthcheck.BackendHealthCheck{}
backend2FrontendMap := map[string]string{}
for _, configuration := range configurations {
frontendNames := sortedFrontendNamesForConfig(configuration)
frontend:
@@ -611,7 +609,7 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo
redirectHandlers[entryPointName] = handler
}
}
if backends[frontend.Backend] == nil {
if backends[entryPointName+frontend.Backend] == nil {
log.Debugf("Creating backend %s", frontend.Backend)
var lb http.Handler
rr, _ := roundrobin.New(saveBackend)
@@ -749,14 +747,14 @@ func (server *Server) loadConfig(configurations configs, globalConfiguration Glo
} else {
negroni.UseHandler(lb)
}
backends[frontend.Backend] = negroni
backends[entryPointName+frontend.Backend] = negroni
} else {
log.Debugf("Reusing backend %s", frontend.Backend)
}
if frontend.Priority > 0 {
newServerRoute.route.Priority(frontend.Priority)
}
server.wireFrontendBackend(newServerRoute, backends[frontend.Backend])
server.wireFrontendBackend(newServerRoute, backends[entryPointName+frontend.Backend])
err := newServerRoute.route.GetError()
if err != nil {