SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: move to Traefik organization.

Browse Source 
Co-authored-by: jbdoumenjou <jb.doumenjou@gmail.com>
This commit is contained in:
Romain
2020-09-21 10:20:04 +02:00
committed by GitHub
parent e382d2940f
commit e148a5b8f7
268 changed files with 3737 additions and 3737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -12,7 +12,7 @@ HOW TO WRITE A GOOD PULL REQUEST?
- Write useful descriptions and titles. - Write useful descriptions and titles.
- Address review comments in terms of additional commits. - Address review comments in terms of additional commits.
- Do not amend/squash existing ones unless the PR is trivial. - Do not amend/squash existing ones unless the PR is trivial.
- Read the contributing guide: https://github.com/containous/traefik/blob/master/CONTRIBUTING.md. - Read the contributing guide: https://github.com/traefik/traefik/blob/master/CONTRIBUTING.md.
--> -->

2
.semaphoreci/setup.sh
View File

@@ -5,7 +5,7 @@ export DOCKER_VERSION=18.09.7
source .semaphoreci/vars source .semaphoreci/vars
if [ -z "${PULL_REQUEST_NUMBER}" ]; then SHOULD_TEST="-*-"; else TEMP_STORAGE=$(curl --silent https://patch-diff.githubusercontent.com/raw/containous/traefik/pull/${PULL_REQUEST_NUMBER}.diff | patch --dry-run -p1 -R); fi if [ -z "${PULL_REQUEST_NUMBER}" ]; then SHOULD_TEST="-*-"; else TEMP_STORAGE=$(curl --silent https://patch-diff.githubusercontent.com/raw/traefik/traefik/pull/${PULL_REQUEST_NUMBER}.diff | patch --dry-run -p1 -R); fi
if [ -n "$TEMP_STORAGE" ]; then SHOULD_TEST=$(echo "$TEMP_STORAGE" | grep -Ev '(.md|.yaml|.yml)' || :); fi if [ -n "$TEMP_STORAGE" ]; then SHOULD_TEST=$(echo "$TEMP_STORAGE" | grep -Ev '(.md|.yaml|.yml)' || :); fi

2
.semaphoreci/vars
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
export REPO='containous/traefik' export REPO='traefik/traefik'
if VERSION=$(git describe --exact-match --abbrev=0 --tags); if VERSION=$(git describe --exact-match --abbrev=0 --tags);
then then

12
.travis.yml
View File

@@ -31,10 +31,10 @@ before_deploy:
make -j${N_MAKE_JOBS} crossbinary-parallel; make -j${N_MAKE_JOBS} crossbinary-parallel;
tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist .; tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist .;
fi; fi;
curl -sfL https://raw.githubusercontent.com/containous/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION} curl -sfL https://raw.githubusercontent.com/traefik/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION}
curl -sSfL https://raw.githubusercontent.com/traefik/mixtus/master/godownloader.sh | sh -s -- -b "${GOPATH}/bin" ${MIXTUS_VERSION} curl -sSfL https://raw.githubusercontent.com/traefik/mixtus/master/godownloader.sh | sh -s -- -b "${GOPATH}/bin" ${MIXTUS_VERSION}
structor -o containous -r traefik --dockerfile-url="https://raw.githubusercontent.com/containous/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/containous/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/containous/structor/master/requirements-override.txt" --exp-branch=master --force-edit-url --debug; structor -o traefik -r traefik --dockerfile-url="https://raw.githubusercontent.com/traefik/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/traefik/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/traefik/structor/master/requirements-override.txt" --exp-branch=master --force-edit-url --debug;
mixtus --dst-doc-path="./traefik" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=containous --src-repo-name=traefik; mixtus --dst-doc-path="./traefik" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=traefik --src-repo-name=traefik;
fi fi
deploy: deploy:
- provider: releases - provider: releases
@@ -43,13 +43,13 @@ deploy:
skip_cleanup: true skip_cleanup: true
file_glob: true file_glob: true
on: on:
repo: containous/traefik repo: traefik/traefik
tags: true tags: true
- provider: script - provider: script
script: sh script/deploy.sh script: sh script/deploy.sh
skip_cleanup: true skip_cleanup: true
on: on:
repo: containous/traefik repo: traefik/traefik
tags: true tags: true
- provider: pages - provider: pages
edge: false edge: false
@@ -57,5 +57,5 @@ deploy:
local_dir: site local_dir: site
skip_cleanup: true skip_cleanup: true
on: on:
repo: containous/traefik repo: traefik/traefik
all_branches: true all_branches: true

5542
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

18
CONTRIBUTING.md
View File

@@ -17,7 +17,7 @@ Step 0 : FROM golang:1.14-alpine
---> 8c6473912976 ---> 8c6473912976
Step 1 : RUN go get github.com/golang/dep/cmd/dep Step 1 : RUN go get github.com/golang/dep/cmd/dep
[...] [...]
docker run --rm -v "/var/run/docker.sock:/var/run/docker.sock" -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github.com/containous/traefik/"dist":/go/src/github.com/containous/traefik/"dist"" "traefik-dev:no-more-godep-ever" ./script/make.sh generate binary docker run --rm -v "/var/run/docker.sock:/var/run/docker.sock" -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github.com/traefik/traefik/"dist":/go/src/github.com/traefik/traefik/"dist"" "traefik-dev:no-more-godep-ever" ./script/make.sh generate binary
---> Making bundle: generate (in .) ---> Making bundle: generate (in .)
removed 'gen.go' removed 'gen.go'
@@ -32,7 +32,7 @@ traefik*
##### Setting up your `go` environment ##### Setting up your `go` environment
- You need `go` v1.9+ - You need `go` v1.9+
- It is recommended you clone Traefik into a directory like `~/go/src/github.com/containous/traefik` (This is the official golang workspace hierarchy, and will allow dependencies to resolve properly) - It is recommended you clone Traefik into a directory like `~/go/src/github.com/traefik/traefik` (This is the official golang workspace hierarchy, and will allow dependencies to resolve properly)
- Set your `GOPATH` and `PATH` variable to be set to `~/go` via: - Set your `GOPATH` and `PATH` variable to be set to `~/go` via:
```bash ```bash
@@ -61,7 +61,7 @@ GORACE=""
Once your environment is set up and the Traefik repository cloned you can build Traefik. You need get `go-bindata` once to be able to use `go generate` command as part of the build. The steps to build are: Once your environment is set up and the Traefik repository cloned you can build Traefik. You need get `go-bindata` once to be able to use `go generate` command as part of the build. The steps to build are:
```bash ```bash
cd ~/go/src/github.com/containous/traefik cd ~/go/src/github.com/traefik/traefik
# Get go-bindata. Please note, the ellipses are required # Get go-bindata. Please note, the ellipses are required
go get github.com/containous/go-bindata/... go get github.com/containous/go-bindata/...
@@ -77,7 +77,7 @@ go build ./cmd/traefik
# run other commands like tests # run other commands like tests
``` ```
You will find the Traefik executable in the `~/go/src/github.com/containous/traefik` folder as `traefik`. You will find the Traefik executable in the `~/go/src/github.com/traefik/traefik` folder as `traefik`.
### Updating the templates ### Updating the templates
@@ -117,13 +117,13 @@ integration test using the `test-integration` target.
$ make test-unit $ make test-unit
docker build -t "traefik-dev:your-feature-branch" -f build.Dockerfile . docker build -t "traefik-dev:your-feature-branch" -f build.Dockerfile .
# […] # […]
docker run --rm -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github/containous/traefik/dist:/go/src/github.com/containous/traefik/dist" "traefik-dev:your-feature-branch" ./script/make.sh generate test-unit docker run --rm -it -e OS_ARCH_ARG -e OS_PLATFORM_ARG -e TESTFLAGS -v "/home/user/go/src/github/traefik/traefik/dist:/go/src/github.com/traefik/traefik/dist" "traefik-dev:your-feature-branch" ./script/make.sh generate test-unit
---> Making bundle: generate (in .) ---> Making bundle: generate (in .)
removed 'gen.go' removed 'gen.go'
---> Making bundle: test-unit (in .) ---> Making bundle: test-unit (in .)
+ go test -cover -coverprofile=cover.out . + go test -cover -coverprofile=cover.out .
ok github.com/containous/traefik 0.005s coverage: 4.1% of statements ok github.com/traefik/traefik 0.005s coverage: 4.1% of statements
Test success Test success
``` ```
@@ -151,7 +151,7 @@ More: https://labix.org/gocheck
Unit tests can be run from the cloned directory by `$ go test ./...` which should return `ok` similar to: Unit tests can be run from the cloned directory by `$ go test ./...` which should return `ok` similar to:
``` ```
ok _/home/user/go/src/github/containous/traefik 0.004s ok _/home/user/go/src/github/traefik/traefik 0.004s
``` ```
Integration tests must be run from the `integration/` directory and require the `-integration` switch to be passed like this: `$ cd integration && go test -integration ./...`. Integration tests must be run from the `integration/` directory and require the `-integration` switch to be passed like this: `$ cd integration && go test -integration ./...`.
@@ -170,7 +170,7 @@ You can build the documentation and serve it locally with livereloading, using t
$ make docs $ make docs
docker build -t traefik-docs -f docs.Dockerfile . docker build -t traefik-docs -f docs.Dockerfile .
# […] # […]
docker run --rm -v /home/user/go/github/containous/traefik:/mkdocs -p 8000:8000 traefik-docs mkdocs serve docker run --rm -v /home/user/go/github/traefik/traefik:/mkdocs -p 8000:8000 traefik-docs mkdocs serve
# […] # […]
[I 170828 20:47:48 server:283] Serving on http://0.0.0.0:8000 [I 170828 20:47:48 server:283] Serving on http://0.0.0.0:8000
[I 170828 20:47:48 handlers:60] Start watching changes [I 170828 20:47:48 handlers:60] Start watching changes
@@ -224,7 +224,7 @@ You can verify that the documentation meets some expectations, as checking for d
$ make docs-verify $ make docs-verify
docker build -t traefik-docs-verify ./script/docs-verify-docker-image ## Build Validator image docker build -t traefik-docs-verify ./script/docs-verify-docker-image ## Build Validator image
... ...
docker run --rm -v /home/travis/build/containous/traefik:/app traefik-docs-verify ## Check for dead links and w3c compliance docker run --rm -v /home/travis/build/traefik/traefik:/app traefik-docs-verify ## Check for dead links and w3c compliance
=== Checking HTML content... === Checking HTML content...
Running ["HtmlCheck", "ImageCheck", "ScriptCheck", "LinkCheck"] on /app/site/basics/index.html on *.html... Running ["HtmlCheck", "ImageCheck", "ScriptCheck", "LinkCheck"] on /app/site/basics/index.html on *.html...
``` ```

10
Gopkg.lock generated
View File

@@ -410,12 +410,12 @@
version = "v3.1.2" version = "v3.1.2"
[[projects]] [[projects]]
digest = "1:02cd7cf98a158c2388f0d26615be0c5d400fc13fad4448f2ecdb61f49b926c74" digest = "1:9b26357809c7871d856b558859d3f3caabbc26842955c87a71e2c84ba6074199"
name = "github.com/containous/traefik-extra-service-fabric" name = "github.com/containous/traefik-extra-service-fabric"
packages = ["."] packages = ["."]
pruneopts = "NUT" pruneopts = "NUT"
revision = "f9f49c0a6d51a8205faf34dd3cb7d628611257e5" revision = "c8e3ab561e7b492243858120742bcb37cd2a327c"
version = "v1.5.0" version = "v1.6.0"
[[projects]] [[projects]]
digest = "1:4e9c9d51ef5c98f2a71d6fa56a22f0bb8a4463656f9591ba24ebff2c21bcbd1f" digest = "1:4e9c9d51ef5c98f2a71d6fa56a22f0bb8a4463656f9591ba24ebff2c21bcbd1f"
@@ -1288,12 +1288,12 @@
version = "v1.0.0" version = "v1.0.0"
[[projects]] [[projects]]
branch = "master"
digest = "1:ad2a63b2d6dfe7d66bf14c01f1171a3951abef6e0fb136170359c3f7c4f51615" digest = "1:ad2a63b2d6dfe7d66bf14c01f1171a3951abef6e0fb136170359c3f7c4f51615"
name = "github.com/labbsr0x/goh" name = "github.com/labbsr0x/goh"
packages = ["gohclient"] packages = ["gohclient"]
pruneopts = "NUT" pruneopts = "NUT"
revision = "94bcf1cb07b70b26b72ad54b2b050bcd0a66a9c8" revision = "b1072e96a179ebd4e11c1a64123a43213099be81"
version = "v1.0.1"
[[projects]] [[projects]]
branch = "master" branch = "master"

4
Gopkg.toml
View File

@@ -80,7 +80,7 @@
[[constraint]] [[constraint]]
name = "github.com/containous/traefik-extra-service-fabric" name = "github.com/containous/traefik-extra-service-fabric"
version = "v1.5.0" version = "1.6.0"
[[constraint]] [[constraint]]
name = "github.com/coreos/go-systemd" name = "github.com/coreos/go-systemd"
@@ -275,4 +275,4 @@
[[override]] [[override]]
name = "github.com/decker502/dnspod-go" name = "github.com/decker502/dnspod-go"
revision = "071171b22a9b65e4f544b61c143befd54a08a64e" revision = "071171b22a9b65e4f544b61c143befd54a08a64e"

2
LICENSE.md
View File

@@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2016-2018 Containous SAS Copyright (c) 2016-2018 Containous SAS; 2020 Traefik Labs
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

6
MAINTAINER.md
View File

@@ -27,7 +27,7 @@ We use [PRM](https://github.com/ldez/prm) to manage locally pull requests.
## Bots ## Bots
### [Myrmica Lobicornis](https://github.com/containous/lobicornis/) ### [Myrmica Lobicornis](https://github.com/traefik/lobicornis/)
**Update and Merge Pull Request** **Update and Merge Pull Request**
@@ -51,13 +51,13 @@ This label is used when:
- Preparing the release - Preparing the release
### [Myrmica Bibikoffi](https://github.com/containous/bibikoffi/) ### [Myrmica Bibikoffi](https://github.com/traefik/bibikoffi/)
* closes stale issues [cron] * closes stale issues [cron]
* use some criterion as number of days between creation, last update, labels, ... * use some criterion as number of days between creation, last update, labels, ...
### [Myrmica Aloba](https://github.com/containous/aloba) ### [Myrmica Aloba](https://github.com/traefik/aloba)
**Manage GitHub labels** **Manage GitHub labels**

4
Makefile
View File

@@ -14,12 +14,12 @@ TRAEFIK_ENVS := \
SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/') SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/')
BIND_DIR := "dist" BIND_DIR := "dist"
TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/containous/traefik/$(BIND_DIR)" TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/traefik/traefik/$(BIND_DIR)"
GIT_BRANCH := $(subst heads/,,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) GIT_BRANCH := $(subst heads/,,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH))) TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH)))
REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]') REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]')
TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"containous/traefik") TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"traefik/traefik")
INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)", -e "TEST_CONTAINER=1" -v "/var/run/docker.sock:/var/run/docker.sock") INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)", -e "TEST_CONTAINER=1" -v "/var/run/docker.sock:/var/run/docker.sock")
TRAEFIK_DOC_IMAGE := traefik-docs TRAEFIK_DOC_IMAGE := traefik-docs
TRAEFIK_DOC_VERIFY_IMAGE := $(TRAEFIK_DOC_IMAGE)-verify TRAEFIK_DOC_VERIFY_IMAGE := $(TRAEFIK_DOC_IMAGE)-verify

10
README.md
View File

@@ -5,9 +5,9 @@
[![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik) [![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik)
[![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io/v1.7) [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io/v1.7)
[![Go Report Card](https://goreportcard.com/badge/containous/traefik)](http://goreportcard.com/report/containous/traefik) [![Go Report Card](https://goreportcard.com/badge/traefik/traefik)](http://goreportcard.com/report/traefik/traefik)
[![](https://images.microbadger.com/badges/image/traefik.svg)](https://microbadger.com/images/traefik) [![](https://images.microbadger.com/badges/image/traefik.svg)](https://microbadger.com/images/traefik)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/containous/traefik/blob/master/LICENSE.md) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/traefik/traefik/blob/master/LICENSE.md)
[![Join the chat at https://slack.traefik.io](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://slack.traefik.io) [![Join the chat at https://slack.traefik.io](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://slack.traefik.io)
[![Twitter](https://img.shields.io/twitter/follow/traefik.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefik) [![Twitter](https://img.shields.io/twitter/follow/traefik.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefik)
@@ -113,13 +113,13 @@ If you need commercial support, please contact [Containo.us](https://containo.us
## Download ## Download
- Grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): - Grab the latest binary from the [releases](https://github.com/traefik/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/v1.7/traefik.sample.toml):
```shell ```shell
./traefik --configFile=traefik.toml ./traefik --configFile=traefik.toml
``` ```
- Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): - Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/v1.7/traefik.sample.toml):
```shell ```shell
docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik
@@ -128,7 +128,7 @@ docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.to
- Or get the sources: - Or get the sources:
```shell ```shell
git clone https://github.com/containous/traefik git clone https://github.com/traefik/traefik
``` ```
## Introductory Videos ## Introductory Videos

6
acme/account.go
View File

@@ -14,11 +14,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/containous/traefik/log"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/types"
"github.com/go-acme/lego/certcrypto" "github.com/go-acme/lego/certcrypto"
"github.com/go-acme/lego/registration" "github.com/go-acme/lego/registration"
"github.com/traefik/traefik/log"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/types"
) )
// Account is used to store lets encrypt registration info // Account is used to store lets encrypt registration info

12
acme/acme.go
View File

@@ -20,12 +20,6 @@ import (
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/staert" "github.com/containous/staert"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/log"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
"github.com/eapache/channels" "github.com/eapache/channels"
"github.com/go-acme/lego/certificate" "github.com/go-acme/lego/certificate"
"github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge"
@@ -36,6 +30,12 @@ import (
"github.com/go-acme/lego/providers/dns" "github.com/go-acme/lego/providers/dns"
"github.com/go-acme/lego/registration" "github.com/go-acme/lego/registration"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/traefik/traefik/cluster"
"github.com/traefik/traefik/log"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
"github.com/traefik/traefik/version"
) )
var ( var (

6
acme/acme_test.go
View File

@@ -11,10 +11,10 @@ import (
"testing" "testing"
"time" "time"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/tls/generate"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/tls/generate"
"github.com/traefik/traefik/types"
) )
func TestDomainsSet(t *testing.T) { func TestDomainsSet(t *testing.T) {

6
acme/challenge_http_provider.go
View File

@@ -6,10 +6,10 @@ import (
"time" "time"
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge"
"github.com/traefik/traefik/cluster"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
) )
var _ challenge.ProviderTimeout = (*challengeHTTPProvider)(nil) var _ challenge.ProviderTimeout = (*challengeHTTPProvider)(nil)

6
acme/challenge_tls_provider.go
View File

@@ -8,11 +8,11 @@ import (
"time" "time"
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/go-acme/lego/challenge" "github.com/go-acme/lego/challenge"
"github.com/go-acme/lego/challenge/tlsalpn01" "github.com/go-acme/lego/challenge/tlsalpn01"
"github.com/traefik/traefik/cluster"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
) )
var _ challenge.ProviderTimeout = (*challengeTLSProvider)(nil) var _ challenge.ProviderTimeout = (*challengeTLSProvider)(nil)

4
acme/localStore.go
View File

@@ -5,8 +5,8 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
"github.com/containous/traefik/provider/acme" "github.com/traefik/traefik/provider/acme"
) )
// LocalStore is a store using a file as storage // LocalStore is a store using a file as storage

48
anonymize/anonymize_config_test.go
View File

@@ -7,32 +7,32 @@ import (
"time" "time"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/api"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/provider"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/provider/boltdb"
"github.com/containous/traefik/provider/consul"
"github.com/containous/traefik/provider/consulcatalog"
"github.com/containous/traefik/provider/docker"
"github.com/containous/traefik/provider/dynamodb"
"github.com/containous/traefik/provider/ecs"
"github.com/containous/traefik/provider/etcd"
"github.com/containous/traefik/provider/eureka"
"github.com/containous/traefik/provider/file"
"github.com/containous/traefik/provider/kubernetes"
"github.com/containous/traefik/provider/kv"
"github.com/containous/traefik/provider/marathon"
"github.com/containous/traefik/provider/mesos"
"github.com/containous/traefik/provider/rancher"
"github.com/containous/traefik/provider/zk"
"github.com/containous/traefik/safe"
traefiktls "github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
assetfs "github.com/elazarl/go-bindata-assetfs" assetfs "github.com/elazarl/go-bindata-assetfs"
"github.com/thoas/stats" "github.com/thoas/stats"
"github.com/traefik/traefik/acme"
"github.com/traefik/traefik/api"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/middlewares"
"github.com/traefik/traefik/provider"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/provider/boltdb"
"github.com/traefik/traefik/provider/consul"
"github.com/traefik/traefik/provider/consulcatalog"
"github.com/traefik/traefik/provider/docker"
"github.com/traefik/traefik/provider/dynamodb"
"github.com/traefik/traefik/provider/ecs"
"github.com/traefik/traefik/provider/etcd"
"github.com/traefik/traefik/provider/eureka"
"github.com/traefik/traefik/provider/file"
"github.com/traefik/traefik/provider/kubernetes"
"github.com/traefik/traefik/provider/kv"
"github.com/traefik/traefik/provider/marathon"
"github.com/traefik/traefik/provider/mesos"
"github.com/traefik/traefik/provider/rancher"
"github.com/traefik/traefik/provider/zk"
"github.com/traefik/traefik/safe"
traefiktls "github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
) )
func TestDo_globalConfiguration(t *testing.T) { func TestDo_globalConfiguration(t *testing.T) {

2
api/dashboard.go
View File

@@ -5,8 +5,8 @@ import (
"net/url" "net/url"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/log"
assetfs "github.com/elazarl/go-bindata-assetfs" assetfs "github.com/elazarl/go-bindata-assetfs"
"github.com/traefik/traefik/log"
) )
// DashboardHandler expose dashboard routes // DashboardHandler expose dashboard routes

10
api/handler.go
View File

@@ -4,13 +4,13 @@ import (
"net/http" "net/http"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/log"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
assetfs "github.com/elazarl/go-bindata-assetfs" assetfs "github.com/elazarl/go-bindata-assetfs"
thoas_stats "github.com/thoas/stats" thoas_stats "github.com/thoas/stats"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/middlewares"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
"github.com/traefik/traefik/version"
"github.com/unrolled/render" "github.com/unrolled/render"
) )

4
build.Dockerfile
View File

@@ -27,5 +27,5 @@ RUN mkdir -p /usr/local/bin \
&& curl -fL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz \ && curl -fL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz \
| tar -xzC /usr/local/bin --transform 's#^.+/##x' | tar -xzC /usr/local/bin --transform 's#^.+/##x'
WORKDIR /go/src/github.com/containous/traefik WORKDIR /go/src/github.com/traefik/traefik
COPY . /go/src/github.com/containous/traefik COPY . /go/src/github.com/traefik/traefik

6
cluster/datastore.go
View File

@@ -10,10 +10,10 @@ import (
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/staert" "github.com/containous/staert"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/traefik/traefik/job"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
) )
// Metadata stores Object plus metadata // Metadata stores Object plus metadata

6
cluster/leadership.go
View File

@@ -7,10 +7,10 @@ import (
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/leadership" "github.com/docker/leadership"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
"github.com/unrolled/render" "github.com/unrolled/render"
) )

8
cmd/bug/bug.go
View File

@@ -9,13 +9,13 @@ import (
"text/template" "text/template"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/anonymize" "github.com/traefik/traefik/anonymize"
"github.com/containous/traefik/cmd" "github.com/traefik/traefik/cmd"
"github.com/containous/traefik/cmd/version" "github.com/traefik/traefik/cmd/version"
) )
const ( const (
bugTracker = "https://github.com/containous/traefik/issues/new" bugTracker = "https://github.com/traefik/traefik/issues/new"
bugTemplate = `<!-- bugTemplate = `<!--
DO NOT FILE ISSUES FOR GENERAL SUPPORT QUESTIONS. DO NOT FILE ISSUES FOR GENERAL SUPPORT QUESTIONS.

12
cmd/bug/bug_test.go
View File

@@ -3,13 +3,13 @@ package bug
import ( import (
"testing" "testing"
"github.com/containous/traefik/anonymize"
"github.com/containous/traefik/cmd"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/provider/file"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/traefik/traefik/anonymize"
"github.com/traefik/traefik/cmd"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/provider/file"
"github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
) )
func Test_createReport(t *testing.T) { func Test_createReport(t *testing.T) {

48
cmd/configuration.go
View File

@@ -5,31 +5,31 @@ import (
"github.com/containous/flaeg" "github.com/containous/flaeg"
servicefabric "github.com/containous/traefik-extra-service-fabric" servicefabric "github.com/containous/traefik-extra-service-fabric"
"github.com/containous/traefik/api"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/middlewares/accesslog"
"github.com/containous/traefik/middlewares/tracing"
"github.com/containous/traefik/middlewares/tracing/datadog"
"github.com/containous/traefik/middlewares/tracing/jaeger"
"github.com/containous/traefik/middlewares/tracing/zipkin"
"github.com/containous/traefik/ping"
"github.com/containous/traefik/provider/boltdb"
"github.com/containous/traefik/provider/consul"
"github.com/containous/traefik/provider/consulcatalog"
"github.com/containous/traefik/provider/docker"
"github.com/containous/traefik/provider/dynamodb"
"github.com/containous/traefik/provider/ecs"
"github.com/containous/traefik/provider/etcd"
"github.com/containous/traefik/provider/eureka"
"github.com/containous/traefik/provider/file"
"github.com/containous/traefik/provider/kubernetes"
"github.com/containous/traefik/provider/marathon"
"github.com/containous/traefik/provider/mesos"
"github.com/containous/traefik/provider/rancher"
"github.com/containous/traefik/provider/rest"
"github.com/containous/traefik/provider/zk"
"github.com/containous/traefik/types"
sf "github.com/jjcollinge/servicefabric" sf "github.com/jjcollinge/servicefabric"
"github.com/traefik/traefik/api"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/middlewares/accesslog"
"github.com/traefik/traefik/middlewares/tracing"
"github.com/traefik/traefik/middlewares/tracing/datadog"
"github.com/traefik/traefik/middlewares/tracing/jaeger"
"github.com/traefik/traefik/middlewares/tracing/zipkin"
"github.com/traefik/traefik/ping"
"github.com/traefik/traefik/provider/boltdb"
"github.com/traefik/traefik/provider/consul"
"github.com/traefik/traefik/provider/consulcatalog"
"github.com/traefik/traefik/provider/docker"
"github.com/traefik/traefik/provider/dynamodb"
"github.com/traefik/traefik/provider/ecs"
"github.com/traefik/traefik/provider/etcd"
"github.com/traefik/traefik/provider/eureka"
"github.com/traefik/traefik/provider/file"
"github.com/traefik/traefik/provider/kubernetes"
"github.com/traefik/traefik/provider/marathon"
"github.com/traefik/traefik/provider/mesos"
"github.com/traefik/traefik/provider/rancher"
"github.com/traefik/traefik/provider/rest"
"github.com/traefik/traefik/provider/zk"
"github.com/traefik/traefik/types"
) )
// TraefikConfiguration holds GlobalConfiguration and other stuff // TraefikConfiguration holds GlobalConfiguration and other stuff

4
cmd/healthcheck/healthcheck.go
View File

@@ -9,8 +9,8 @@ import (
"time" "time"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/cmd" "github.com/traefik/traefik/cmd"
"github.com/containous/traefik/configuration" "github.com/traefik/traefik/configuration"
) )
// NewCmd builds a new HealthCheck command // NewCmd builds a new HealthCheck command

8
cmd/storeconfig/storeconfig.go
View File

@@ -10,10 +10,10 @@ import (
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/staert" "github.com/containous/staert"
"github.com/containous/traefik/acme" "github.com/traefik/traefik/acme"
"github.com/containous/traefik/cluster" "github.com/traefik/traefik/cluster"
"github.com/containous/traefik/cmd" "github.com/traefik/traefik/cmd"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
) )
// NewCmd builds a new StoreConfig command // NewCmd builds a new StoreConfig command

38
cmd/traefik/traefik.go
View File

@@ -14,29 +14,29 @@ import (
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/staert" "github.com/containous/staert"
"github.com/containous/traefik/autogen/genstatic"
"github.com/containous/traefik/cmd"
"github.com/containous/traefik/cmd/bug"
"github.com/containous/traefik/cmd/healthcheck"
"github.com/containous/traefik/cmd/storeconfig"
cmdVersion "github.com/containous/traefik/cmd/version"
"github.com/containous/traefik/collector"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/configuration/router"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider/ecs"
"github.com/containous/traefik/provider/kubernetes"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/server"
"github.com/containous/traefik/server/uuid"
traefiktls "github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
"github.com/coreos/go-systemd/daemon" "github.com/coreos/go-systemd/daemon"
assetfs "github.com/elazarl/go-bindata-assetfs" assetfs "github.com/elazarl/go-bindata-assetfs"
"github.com/ogier/pflag" "github.com/ogier/pflag"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/traefik/traefik/autogen/genstatic"
"github.com/traefik/traefik/cmd"
"github.com/traefik/traefik/cmd/bug"
"github.com/traefik/traefik/cmd/healthcheck"
"github.com/traefik/traefik/cmd/storeconfig"
cmdVersion "github.com/traefik/traefik/cmd/version"
"github.com/traefik/traefik/collector"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/configuration/router"
"github.com/traefik/traefik/job"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/provider/ecs"
"github.com/traefik/traefik/provider/kubernetes"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/server"
"github.com/traefik/traefik/server/uuid"
traefiktls "github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
"github.com/traefik/traefik/version"
"github.com/vulcand/oxy/roundrobin" "github.com/vulcand/oxy/roundrobin"
) )

2
cmd/version/version.go
View File

@@ -8,7 +8,7 @@ import (
"text/template" "text/template"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/version" "github.com/traefik/traefik/version"
) )
var versionTemplate = `Version: {{.Version}} var versionTemplate = `Version: {{.Version}}

8
collector/collector.go
View File

@@ -9,11 +9,11 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/containous/traefik/anonymize"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/log"
"github.com/containous/traefik/version"
"github.com/mitchellh/hashstructure" "github.com/mitchellh/hashstructure"
"github.com/traefik/traefik/anonymize"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/version"
) )
// collectorURL URL where the stats are send // collectorURL URL where the stats are send

52
configuration/configuration.go
View File

@@ -7,34 +7,34 @@ import (
"github.com/containous/flaeg" "github.com/containous/flaeg"
servicefabric "github.com/containous/traefik-extra-service-fabric" servicefabric "github.com/containous/traefik-extra-service-fabric"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/api"
"github.com/containous/traefik/log"
"github.com/containous/traefik/middlewares/tracing"
"github.com/containous/traefik/middlewares/tracing/datadog"
"github.com/containous/traefik/middlewares/tracing/jaeger"
"github.com/containous/traefik/middlewares/tracing/zipkin"
"github.com/containous/traefik/ping"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/provider/boltdb"
"github.com/containous/traefik/provider/consul"
"github.com/containous/traefik/provider/consulcatalog"
"github.com/containous/traefik/provider/docker"
"github.com/containous/traefik/provider/dynamodb"
"github.com/containous/traefik/provider/ecs"
"github.com/containous/traefik/provider/etcd"
"github.com/containous/traefik/provider/eureka"
"github.com/containous/traefik/provider/file"
"github.com/containous/traefik/provider/kubernetes"
"github.com/containous/traefik/provider/marathon"
"github.com/containous/traefik/provider/mesos"
"github.com/containous/traefik/provider/rancher"
"github.com/containous/traefik/provider/rest"
"github.com/containous/traefik/provider/zk"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/go-acme/lego/challenge/dns01" "github.com/go-acme/lego/challenge/dns01"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/traefik/traefik/acme"
"github.com/traefik/traefik/api"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/middlewares/tracing"
"github.com/traefik/traefik/middlewares/tracing/datadog"
"github.com/traefik/traefik/middlewares/tracing/jaeger"
"github.com/traefik/traefik/middlewares/tracing/zipkin"
"github.com/traefik/traefik/ping"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/provider/boltdb"
"github.com/traefik/traefik/provider/consul"
"github.com/traefik/traefik/provider/consulcatalog"
"github.com/traefik/traefik/provider/docker"
"github.com/traefik/traefik/provider/dynamodb"
"github.com/traefik/traefik/provider/ecs"
"github.com/traefik/traefik/provider/etcd"
"github.com/traefik/traefik/provider/eureka"
"github.com/traefik/traefik/provider/file"
"github.com/traefik/traefik/provider/kubernetes"
"github.com/traefik/traefik/provider/marathon"
"github.com/traefik/traefik/provider/mesos"
"github.com/traefik/traefik/provider/rancher"
"github.com/traefik/traefik/provider/rest"
"github.com/traefik/traefik/provider/zk"
"github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
jaegercli "github.com/uber/jaeger-client-go" jaegercli "github.com/uber/jaeger-client-go"
) )

16
configuration/configuration_test.go
View File

@@ -5,15 +5,15 @@ import (
"time" "time"
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/middlewares/tracing"
"github.com/containous/traefik/middlewares/tracing/jaeger"
"github.com/containous/traefik/middlewares/tracing/zipkin"
"github.com/containous/traefik/provider"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/provider/file"
"github.com/containous/traefik/tls"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/traefik/traefik/acme"
"github.com/traefik/traefik/middlewares/tracing"
"github.com/traefik/traefik/middlewares/tracing/jaeger"
"github.com/traefik/traefik/middlewares/tracing/zipkin"
"github.com/traefik/traefik/provider"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/provider/file"
"github.com/traefik/traefik/tls"
) )
const defaultConfigFile = "traefik.toml" const defaultConfigFile = "traefik.toml"

6
configuration/entrypoints.go
View File

@@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
"github.com/containous/traefik/tls" "github.com/traefik/traefik/tls"
"github.com/containous/traefik/types" "github.com/traefik/traefik/types"
) )
// EntryPoint holds an entry point configuration of the reverse proxy (ip, port, TLS...) // EntryPoint holds an entry point configuration of the reverse proxy (ip, port, TLS...)

4
configuration/entrypoints_test.go
View File

@@ -3,10 +3,10 @@ package configuration
import ( import (
"testing" "testing"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
) )
func Test_parseEntryPointsConfiguration(t *testing.T) { func Test_parseEntryPointsConfiguration(t *testing.T) {

8
configuration/provider_aggregator.go
View File

@@ -3,10 +3,10 @@ package configuration
import ( import (
"encoding/json" "encoding/json"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
"github.com/containous/traefik/provider" "github.com/traefik/traefik/provider"
"github.com/containous/traefik/safe" "github.com/traefik/traefik/safe"
"github.com/containous/traefik/types" "github.com/traefik/traefik/types"
) )
// ProviderAggregator aggregate providers // ProviderAggregator aggregate providers

12
configuration/router/internal_router.go
View File

@@ -2,12 +2,12 @@ package router
import ( import (
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/configuration" "github.com/traefik/traefik/configuration"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
"github.com/containous/traefik/metrics" "github.com/traefik/traefik/metrics"
"github.com/containous/traefik/middlewares" "github.com/traefik/traefik/middlewares"
mauth "github.com/containous/traefik/middlewares/auth" mauth "github.com/traefik/traefik/middlewares/auth"
"github.com/containous/traefik/types" "github.com/traefik/traefik/types"
"github.com/urfave/negroni" "github.com/urfave/negroni"
) )

14
configuration/router/internal_router_test.go
View File

@@ -6,14 +6,14 @@ import (
"testing" "testing"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/api"
"github.com/containous/traefik/configuration"
"github.com/containous/traefik/ping"
acmeprovider "github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/traefik/traefik/acme"
"github.com/traefik/traefik/api"
"github.com/traefik/traefik/configuration"
"github.com/traefik/traefik/ping"
acmeprovider "github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
"github.com/urfave/negroni" "github.com/urfave/negroni"
) )

6
docs/basics.md
View File

@@ -652,7 +652,7 @@ docker run traefik[:version] --help
### Command: bug ### Command: bug
Here is the easiest way to submit a pre-filled issue on [Traefik GitHub](https://github.com/containous/traefik). Here is the easiest way to submit a pre-filled issue on [Traefik GitHub](https://github.com/traefik/traefik).
```bash ```bash
traefik bug traefik bug
@@ -681,7 +681,7 @@ OK: http://:8082/ping
**This feature is disabled by default.** **This feature is disabled by default.**
You can read the public proposal on this topic [here](https://github.com/containous/traefik/issues/2369). You can read the public proposal on this topic [here](https://github.com/traefik/traefik/issues/2369).
### Why ? ### Why ?
@@ -767,7 +767,7 @@ Once a day (the first call begins 10 minutes after the start of Traefik), we col
### Show me the code ! ### Show me the code !
If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/containous/traefik/blob/v1.7/collector/collector.go) If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/traefik/traefik/blob/v1.7/collector/collector.go)
By default we anonymize all configuration fields, except fields tagged with `export=true`. By default we anonymize all configuration fields, except fields tagged with `export=true`.

2
docs/benchmarks.md
View File

@@ -15,7 +15,7 @@ I used 4 VMs for the tests with the following configuration:
1. One VM used to launch the benchmarking tool [wrk](https://github.com/wg/wrk) 1. One VM used to launch the benchmarking tool [wrk](https://github.com/wg/wrk)
2. One VM for Traefik (v1.0.0-beta.416) / nginx (v1.4.6) 2. One VM for Traefik (v1.0.0-beta.416) / nginx (v1.4.6)
3. Two VMs for 2 backend servers in go [whoami](https://github.com/containous/whoami/) 3. Two VMs for 2 backend servers in go [whoami](https://github.com/traefik/whoami/)
Each VM has been tuned using the following limits: Each VM has been tuned using the following limits:

2
docs/configuration/backends/docker.md
View File

@@ -236,7 +236,7 @@ It allows different implementation levels of the [AAA (Authentication, Authoriza
Use the following ressources to get started: Use the following ressources to get started:
- [Traefik issue GH-4174 about security with Docker socket](https://github.com/containous/traefik/issues/4174) - [Traefik issue GH-4174 about security with Docker socket](https://github.com/traefik/traefik/issues/4174)
- [Inspecting Docker Activity with Socat](https://developers.redhat.com/blog/2015/02/25/inspecting-docker-activity-with-socat/) - [Inspecting Docker Activity with Socat](https://developers.redhat.com/blog/2015/02/25/inspecting-docker-activity-with-socat/)
- [Letting Traefik run on Worker Nodes](https://blog.mikesir87.io/2018/07/letting-traefik-run-on-worker-nodes/) - [Letting Traefik run on Worker Nodes](https://blog.mikesir87.io/2018/07/letting-traefik-run-on-worker-nodes/)
- [Docker Socket Proxy from Tecnativa](https://github.com/Tecnativa/docker-socket-proxy) - [Docker Socket Proxy from Tecnativa](https://github.com/Tecnativa/docker-socket-proxy)

2
docs/configuration/logs.md
View File

@@ -356,7 +356,7 @@ version: '3'
services: services:
traefik: traefik:
image: containous/traefik:[latest stable version] image: traefik/traefik:[latest stable version]
ports: ports:
- "80:80" - "80:80"
environment: environment:

10
docs/index.md
View File

@@ -4,8 +4,8 @@
[![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik) [![Build Status SemaphoreCI](https://semaphoreci.com/api/v1/containous/traefik/branches/master/shields_badge.svg)](https://semaphoreci.com/containous/traefik)
[![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](/) [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](/)
[![Go Report Card](https://goreportcard.com/badge/github.com/containous/traefik)](https://goreportcard.com/report/github.com/containous/traefik) [![Go Report Card](https://goreportcard.com/badge/github.com/traefik/traefik)](https://goreportcard.com/report/github.com/traefik/traefik)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/containous/traefik/blob/master/LICENSE.md) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/traefik/traefik/blob/master/LICENSE.md)
[![Join the community support forum at https://community.containo.us/](https://img.shields.io/badge/style-register-green.svg?style=social&label=Discourse)](https://community.containo.us/) [![Join the community support forum at https://community.containo.us/](https://img.shields.io/badge/style-register-green.svg?style=social&label=Discourse)](https://community.containo.us/)
[![Twitter](https://img.shields.io/twitter/follow/traefik.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefik) [![Twitter](https://img.shields.io/twitter/follow/traefik.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefik)
@@ -66,7 +66,7 @@ _(But if you'd rather configure some of your routes manually, Traefik supports t
In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure. In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure.
To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/v1.7/examples/quickstart/) directory. To save some time, you can clone [Traefik's repository](https://github.com/traefik/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/traefik/traefik/tree/v1.7/examples/quickstart/) directory.
### 1 — Launch Traefik — Tell It to Listen to Docker ### 1 — Launch Traefik — Tell It to Listen to Docker
@@ -109,7 +109,7 @@ Edit your `docker-compose.yml` file and add the following at the end of your fil
```yaml ```yaml
# ... # ...
whoami: whoami:
image: containous/whoami # A container that exposes an API to show its IP address image: traefik/whoami # A container that exposes an API to show its IP address
labels: labels:
- "traefik.frontend.rule=Host:whoami.docker.localhost" - "traefik.frontend.rule=Host:whoami.docker.localhost"
``` ```
@@ -190,7 +190,7 @@ You will learn fundamental Traefik features and see some demos with Kubernetes.
### The Official Binary File ### The Official Binary File
You can grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and just run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): You can grab the latest binary from the [releases](https://github.com/traefik/traefik/releases) page and just run it with the [sample configuration file](https://raw.githubusercontent.com/traefik/traefik/v1.7/traefik.sample.toml):
```shell ```shell
./traefik -c traefik.toml ./traefik -c traefik.toml

4
docs/user-guide/examples.md
View File

@@ -371,7 +371,7 @@ home:
Something more tricky using `regex`. Something more tricky using `regex`.
In this case a slash is added to `siteexample.io/portainer` and redirect to `siteexample.io/portainer/`. For more details: https://github.com/containous/traefik/issues/563 In this case a slash is added to `siteexample.io/portainer` and redirect to `siteexample.io/portainer/`. For more details: https://github.com/traefik/traefik/issues/563
The double sign `$$` are variables managed by the docker compose file ([documentation](https://docs.docker.com/compose/compose-file/#variable-substitution)). The double sign `$$` are variables managed by the docker compose file ([documentation](https://docs.docker.com/compose/compose-file/#variable-substitution)).
@@ -408,7 +408,7 @@ portainer:
- "traefik.frontend.entryPoints=http" - "traefik.frontend.entryPoints=http"
- "traefik.backend.loadbalancer.swarm=true" - "traefik.backend.loadbalancer.swarm=true"
- "traefik.backend.loadbalancer.method=drr" - "traefik.backend.loadbalancer.method=drr"
# https://github.com/containous/traefik/issues/563#issuecomment-421360934 # https://github.com/traefik/traefik/issues/563#issuecomment-421360934
- "traefik.frontend.redirect.regex=^(.*)/portainer$$" - "traefik.frontend.redirect.regex=^(.*)/portainer$$"
- "traefik.frontend.redirect.replacement=$$1/portainer/" - "traefik.frontend.redirect.replacement=$$1/portainer/"
- "traefik.frontend.rule=PathPrefix:/portainer;ReplacePathRegex: ^/portainer/(.*) /$$1" - "traefik.frontend.rule=PathPrefix:/portainer;ReplacePathRegex: ^/portainer/(.*) /$$1"

36
docs/user-guide/kubernetes.md
View File

@@ -4,7 +4,7 @@ This guide explains how to use Traefik as an Ingress controller for a Kubernetes
If you are not familiar with Ingresses in Kubernetes you might want to read the [Kubernetes user guide](https://kubernetes.io/docs/concepts/services-networking/ingress/) If you are not familiar with Ingresses in Kubernetes you might want to read the [Kubernetes user guide](https://kubernetes.io/docs/concepts/services-networking/ingress/)
The config files used in this guide can be found in the [examples directory](https://github.com/containous/traefik/tree/v1.7/examples/k8s) The config files used in this guide can be found in the [examples directory](https://github.com/traefik/traefik/tree/v1.7/examples/k8s)
## Prerequisites ## Prerequisites
@@ -78,10 +78,10 @@ subjects:
namespace: kube-system namespace: kube-system
``` ```
[examples/k8s/traefik-rbac.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-rbac.yaml) [examples/k8s/traefik-rbac.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/traefik-rbac.yaml)
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-rbac.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/traefik-rbac.yaml
``` ```
For namespaced restrictions, one RoleBinding is required per watched namespace along with a corresponding configuration of Traefik's `kubernetes.namespaces` parameter. For namespaced restrictions, one RoleBinding is required per watched namespace along with a corresponding configuration of Traefik's `kubernetes.namespaces` parameter.
@@ -158,7 +158,7 @@ spec:
type: NodePort type: NodePort
``` ```
[examples/k8s/traefik-deployment.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-deployment.yaml) [examples/k8s/traefik-deployment.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/traefik-deployment.yaml)
!!! note !!! note
The Service will expose two NodePorts which allow access to the ingress and the web interface. The Service will expose two NodePorts which allow access to the ingress and the web interface.
@@ -231,7 +231,7 @@ spec:
name: admin name: admin
``` ```
[examples/k8s/traefik-ds.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-ds.yaml) [examples/k8s/traefik-ds.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/traefik-ds.yaml)
!!! note !!! note
This will create a Daemonset that uses privileged ports 80/8080 on the host. This may not work on all providers, but illustrates the static (non-NodePort) hostPort binding. The `traefik-ingress-service` can still be used inside the cluster to access the DaemonSet pods. This will create a Daemonset that uses privileged ports 80/8080 on the host. This may not work on all providers, but illustrates the static (non-NodePort) hostPort binding. The `traefik-ingress-service` can still be used inside the cluster to access the DaemonSet pods.
@@ -239,11 +239,11 @@ spec:
To deploy Traefik to your cluster start by submitting one of the YAML files to the cluster with `kubectl`: To deploy Traefik to your cluster start by submitting one of the YAML files to the cluster with `kubectl`:
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-deployment.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/traefik-deployment.yaml
``` ```
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-ds.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/traefik-ds.yaml
``` ```
There are some significant differences between using Deployments and DaemonSets: There are some significant differences between using Deployments and DaemonSets:
@@ -335,7 +335,7 @@ For more information, check out [the documentation](https://github.com/kubernete
## Submitting an Ingress to the Cluster ## Submitting an Ingress to the Cluster
Lets start by creating a Service and an Ingress that will expose the [Traefik Web UI](https://github.com/containous/traefik#web-ui). Lets start by creating a Service and an Ingress that will expose the [Traefik Web UI](https://github.com/traefik/traefik#web-ui).
```yaml ```yaml
apiVersion: v1 apiVersion: v1
@@ -367,10 +367,10 @@ spec:
servicePort: web servicePort: web
``` ```
[examples/k8s/ui.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/ui.yaml) [examples/k8s/ui.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/ui.yaml)
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/ui.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/ui.yaml
``` ```
Now let's setup an entry in our `/etc/hosts` file to route `traefik-ui.minikube` to our cluster. Now let's setup an entry in our `/etc/hosts` file to route `traefik-ui.minikube` to our cluster.
@@ -613,10 +613,10 @@ spec:
- containerPort: 80 - containerPort: 80
``` ```
[examples/k8s/cheese-deployments.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-deployments.yaml) [examples/k8s/cheese-deployments.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/cheese-deployments.yaml)
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-deployments.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/cheese-deployments.yaml
``` ```
Next we need to setup a Service for each of the cheese pods. Next we need to setup a Service for each of the cheese pods.
@@ -668,10 +668,10 @@ spec:
!!! note !!! note
We also set a [circuit breaker expression](/basics/#backends) for one of the backends by setting the `traefik.backend.circuitbreaker` annotation on the service. We also set a [circuit breaker expression](/basics/#backends) for one of the backends by setting the `traefik.backend.circuitbreaker` annotation on the service.
[examples/k8s/cheese-services.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-services.yaml) [examples/k8s/cheese-services.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/cheese-services.yaml)
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-services.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/cheese-services.yaml
``` ```
Now we can submit an ingress for the cheese websites. Now we can submit an ingress for the cheese websites.
@@ -708,13 +708,13 @@ spec:
servicePort: http servicePort: http
``` ```
[examples/k8s/cheese-ingress.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-ingress.yaml) [examples/k8s/cheese-ingress.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/cheese-ingress.yaml)
!!! note !!! note
We list each hostname, and add a backend service. We list each hostname, and add a backend service.
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-ingress.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/cheese-ingress.yaml
``` ```
Now visit the [Traefik dashboard](http://traefik-ui.minikube/) and you should see a frontend for each host. Now visit the [Traefik dashboard](http://traefik-ui.minikube/) and you should see a frontend for each host.
@@ -763,13 +763,13 @@ spec:
servicePort: http servicePort: http
``` ```
[examples/k8s/cheeses-ingress.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheeses-ingress.yaml) [examples/k8s/cheeses-ingress.yaml](https://github.com/traefik/traefik/tree/v1.7/examples/k8s/cheeses-ingress.yaml)
!!! note !!! note
We are configuring Traefik to strip the prefix from the url path with the `traefik.frontend.rule.type` annotation so that we can use the containers from the previous example without modification. We are configuring Traefik to strip the prefix from the url path with the `traefik.frontend.rule.type` annotation so that we can use the containers from the previous example without modification.
```shell ```shell
kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheeses-ingress.yaml kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v1.7/examples/k8s/cheeses-ingress.yaml
``` ```
```shell ```shell

10
docs/user-guide/kv-config.md
View File

@@ -24,7 +24,7 @@ The Traefik global configuration will be retrieved from a [Consul](https://consu
First we have to launch Consul in a container. First we have to launch Consul in a container.
The [docker-compose file](https://docs.docker.com/compose/compose-file/) allows us to launch Consul and four instances of the trivial app [containous/whoami](https://github.com/containous/whoami) : The [docker-compose file](https://docs.docker.com/compose/compose-file/) allows us to launch Consul and four instances of the trivial app [traefik/whoami](https://github.com/traefik/whoami) :
```yaml ```yaml
consul: consul:
@@ -42,16 +42,16 @@ consul:
- "8302/udp" - "8302/udp"
whoami1: whoami1:
image: containous/whoami image: traefik/whoami
whoami2: whoami2:
image: containous/whoami image: traefik/whoami
whoami3: whoami3:
image: containous/whoami image: traefik/whoami
whoami4: whoami4:
image: containous/whoami image: traefik/whoami
``` ```
### Upload the configuration in the Key-value store ### Upload the configuration in the Key-value store

4
docs/user-guide/marathon.md
View File

@@ -129,7 +129,7 @@ As such, there is no way to handle this situation deterministically.
Finally, Marathon health checks are not mandatory (the default is to use the task state as reported by Mesos), so requiring them for Traefik would raise the entry barrier for Marathon users. Finally, Marathon health checks are not mandatory (the default is to use the task state as reported by Mesos), so requiring them for Traefik would raise the entry barrier for Marathon users.
Traefik used to use the health check results as a strict requirement but moved away from it as [users reported the dramatic consequences](https://github.com/containous/traefik/issues/653). Traefik used to use the health check results as a strict requirement but moved away from it as [users reported the dramatic consequences](https://github.com/traefik/traefik/issues/653).
#### Draining #### Draining
@@ -141,4 +141,4 @@ However, implementing this fully within Traefik seems like a non-trivial underta
Additionally, the approach is less flexible compared to a custom termination handler since only the latter allows for the implementation of custom termination sequences that go beyond simple request draining (e.g., persisting a snapshot state to disk prior to terminating). Additionally, the approach is less flexible compared to a custom termination handler since only the latter allows for the implementation of custom termination sequences that go beyond simple request draining (e.g., persisting a snapshot state to disk prior to terminating).
The feature is currently not implemented; a request for draining in general is at [issue 41](https://github.com/containous/traefik/issues/41). The feature is currently not implemented; a request for draining in general is at [issue 41](https://github.com/traefik/traefik/issues/41).

16
docs/user-guide/swarm-mode.md
View File

@@ -107,7 +107,7 @@ Let's explain this command:
## Deploy your apps ## Deploy your apps
We can now deploy our app on the cluster, here [whoami](https://github.com/containous/whoami), a simple web server in Go. We can now deploy our app on the cluster, here [whoami](https://github.com/traefik/whoami), a simple web server in Go.
We start 2 services, on the `traefik-net` network. We start 2 services, on the `traefik-net` network.
```shell ```shell
@@ -115,14 +115,14 @@ docker-machine ssh manager "docker service create \
--name whoami0 \ --name whoami0 \
--label traefik.port=80 \ --label traefik.port=80 \
--network traefik-net \ --network traefik-net \
containous/whoami" traefik/whoami"
docker-machine ssh manager "docker service create \ docker-machine ssh manager "docker service create \
--name whoami1 \ --name whoami1 \
--label traefik.port=80 \ --label traefik.port=80 \
--network traefik-net \ --network traefik-net \
--label traefik.backend.loadbalancer.sticky=true \ --label traefik.backend.loadbalancer.sticky=true \
containous/whoami" traefik/whoami"
``` ```
!!! note !!! note
@@ -130,7 +130,7 @@ docker-machine ssh manager "docker service create \
We'll demonstrate that later. We'll demonstrate that later.
!!! note !!! note
If using `docker stack deploy`, there is [a specific way that the labels must be defined in the docker-compose file](https://github.com/containous/traefik/issues/994#issuecomment-269095109). If using `docker stack deploy`, there is [a specific way that the labels must be defined in the docker-compose file](https://github.com/traefik/traefik/issues/994#issuecomment-269095109).
Check that everything is scheduled and started: Check that everything is scheduled and started:
@@ -140,8 +140,8 @@ docker-machine ssh manager "docker service ls"
``` ```
ID NAME MODE REPLICAS IMAGE PORTS ID NAME MODE REPLICAS IMAGE PORTS
moq3dq4xqv6t traefik replicated 1/1 traefik:latest *:80->80/tcp,*:8080->8080/tcp moq3dq4xqv6t traefik replicated 1/1 traefik:latest *:80->80/tcp,*:8080->8080/tcp
ysil6oto1wim whoami0 replicated 1/1 containous/whoami:latest ysil6oto1wim whoami0 replicated 1/1 traefik/whoami:latest
z9re2mnl34k4 whoami1 replicated 1/1 containous/whoami:latest z9re2mnl34k4 whoami1 replicated 1/1 traefik/whoami:latest
``` ```
@@ -243,8 +243,8 @@ docker-machine ssh manager "docker service ls"
``` ```
ID NAME MODE REPLICAS IMAGE PORTS ID NAME MODE REPLICAS IMAGE PORTS
moq3dq4xqv6t traefik replicated 1/1 traefik:latest *:80->80/tcp,*:8080->8080/tcp moq3dq4xqv6t traefik replicated 1/1 traefik:latest *:80->80/tcp,*:8080->8080/tcp
ysil6oto1wim whoami0 replicated 5/5 containous/whoami:latest ysil6oto1wim whoami0 replicated 5/5 traefik/whoami:latest
z9re2mnl34k4 whoami1 replicated 5/5 containous/whoami:latest z9re2mnl34k4 whoami1 replicated 5/5 traefik/whoami:latest
``` ```
## Access to your `whoami0` through Traefik multiple times. ## Access to your `whoami0` through Traefik multiple times.

10
docs/user-guide/swarm.md
View File

@@ -112,12 +112,12 @@ Let's explain this command:
## Deploy your apps ## Deploy your apps
We can now deploy our app on the cluster, here [whoami](https://github.com/containous/whoami), a simple web server in GO, on the network `my-net`: We can now deploy our app on the cluster, here [whoami](https://github.com/traefik/whoami), a simple web server in GO, on the network `my-net`:
```shell ```shell
eval $(docker-machine env --swarm mhs-demo0) eval $(docker-machine env --swarm mhs-demo0)
docker run -d --name=whoami0 --net=my-net --env="constraint:node==mhs-demo0" containous/whoami docker run -d --name=whoami0 --net=my-net --env="constraint:node==mhs-demo0" traefik/whoami
docker run -d --name=whoami1 --net=my-net --env="constraint:node==mhs-demo1" containous/whoami docker run -d --name=whoami1 --net=my-net --env="constraint:node==mhs-demo1" traefik/whoami
``` ```
Check that everything is started: Check that everything is started:
@@ -127,8 +127,8 @@ docker ps
``` ```
``` ```
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
ba2c21488299 containous/whoami "/whoamI" 8 seconds ago Up 9 seconds 80/tcp mhs-demo1/whoami1 ba2c21488299 traefik/whoami "/whoamI" 8 seconds ago Up 9 seconds 80/tcp mhs-demo1/whoami1
8147a7746e7a containous/whoami "/whoamI" 19 seconds ago Up 20 seconds 80/tcp mhs-demo0/whoami0 8147a7746e7a traefik/whoami "/whoamI" 19 seconds ago Up 20 seconds 80/tcp mhs-demo0/whoami0
8fbc39271b4c traefik "/traefik -l DEBUG -c" 36 seconds ago Up 37 seconds 192.168.99.101:80->80/tcp, 192.168.99.101:8080->8080/tcp mhs-demo0/serene_bhabha 8fbc39271b4c traefik "/traefik -l DEBUG -c" 36 seconds ago Up 37 seconds 192.168.99.101:80->80/tcp, 192.168.99.101:8080->8080/tcp mhs-demo0/serene_bhabha
``` ```

2
examples/acme/docker-compose.yml
View File

@@ -72,7 +72,7 @@ services :
traefik: traefik:
build: build:
context: ../.. context: ../..
image: containous/traefik:latest image: traefik/traefik:latest
command: --configFile=/etc/traefik/conf/acme.toml command: --configFile=/etc/traefik/conf/acme.toml
restart: unless-stopped restart: unless-stopped
extra_hosts: extra_hosts:

6
examples/cluster/docker-compose.yml
View File

@@ -119,7 +119,7 @@ services:
storeconfig: storeconfig:
build: build:
context: ../.. context: ../..
image: containous/traefik image: traefik/traefik
volumes: volumes:
- "./traefik.toml:/traefik.toml:ro" - "./traefik.toml:/traefik.toml:ro"
command: storeconfig --debug command: storeconfig --debug
@@ -129,7 +129,7 @@ services:
traefik01: traefik01:
build: build:
context: ../.. context: ../..
image: containous/traefik image: traefik/traefik
command: ${TRAEFIK_CMD} command: ${TRAEFIK_CMD}
extra_hosts: extra_hosts:
- traefik.boulder.com:172.17.0.1 - traefik.boulder.com:172.17.0.1
@@ -152,7 +152,7 @@ services:
traefik02: traefik02:
build: build:
context: ../.. context: ../..
image: containous/traefik image: traefik/traefik
command: ${TRAEFIK_CMD} command: ${TRAEFIK_CMD}
extra_hosts: extra_hosts:
- traefik.boulder.com:172.17.0.1 - traefik.boulder.com:172.17.0.1

2
examples/quickstart/README.md
View File

@@ -2,7 +2,7 @@
In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure. In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure.
To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/v1.7/examples/quickstart/) directory. To save some time, you can clone [Traefik's repository](https://github.com/traefik/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/traefik/traefik/tree/v1.7/examples/quickstart/) directory.
### 1 — Launch Traefik — Tell It to Listen to Docker ### 1 — Launch Traefik — Tell It to Listen to Docker

10
exp.Dockerfile
View File

@@ -23,11 +23,11 @@ RUN mkdir -p /usr/local/bin \
&& curl -fsSL -o /usr/local/bin/go-bindata https://github.com/containous/go-bindata/releases/download/v1.0.0/go-bindata \ && curl -fsSL -o /usr/local/bin/go-bindata https://github.com/containous/go-bindata/releases/download/v1.0.0/go-bindata \
&& chmod +x /usr/local/bin/go-bindata && chmod +x /usr/local/bin/go-bindata
WORKDIR /go/src/github.com/containous/traefik WORKDIR /go/src/github.com/traefik/traefik
COPY . /go/src/github.com/containous/traefik COPY . /go/src/github.com/traefik/traefik
RUN rm -rf /go/src/github.com/containous/traefik/static/ RUN rm -rf /go/src/github.com/traefik/traefik/static/
COPY --from=webui /src/static/ /go/src/github.com/containous/traefik/static/ COPY --from=webui /src/static/ /go/src/github.com/traefik/traefik/static/
RUN ./script/make.sh generate binary RUN ./script/make.sh generate binary
@@ -36,7 +36,7 @@ FROM scratch
COPY --from=gobuild /usr/share/zoneinfo /usr/share/zoneinfo COPY --from=gobuild /usr/share/zoneinfo /usr/share/zoneinfo
COPY --from=gobuild /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=gobuild /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=gobuild /go/src/github.com/containous/traefik/dist/traefik / COPY --from=gobuild /go/src/github.com/traefik/traefik/dist/traefik /
EXPOSE 80 EXPOSE 80
VOLUME ["/tmp"] VOLUME ["/tmp"]

2
h2c/h2c.go
View File

@@ -22,7 +22,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
"golang.org/x/net/http/httpguts" "golang.org/x/net/http/httpguts"
"golang.org/x/net/http2" "golang.org/x/net/http2"

4
healthcheck/healthcheck.go
View File

@@ -10,9 +10,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/go-kit/kit/metrics" "github.com/go-kit/kit/metrics"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/vulcand/oxy/roundrobin" "github.com/vulcand/oxy/roundrobin"
) )

2
healthcheck/healthcheck_test.go
View File

@@ -9,9 +9,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/containous/traefik/testhelpers"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/traefik/traefik/testhelpers"
"github.com/vulcand/oxy/roundrobin" "github.com/vulcand/oxy/roundrobin"
) )

2
hostresolver/hostresolver.go
View File

@@ -7,9 +7,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/containous/traefik/log"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/patrickmn/go-cache" "github.com/patrickmn/go-cache"
"github.com/traefik/traefik/log"
) )
type cnameResolv struct { type cnameResolv struct {

4
integration/access_log_test.go
View File

@@ -11,9 +11,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/middlewares/accesslog"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/middlewares/accesslog"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

8
integration/acme_test.go
View File

@@ -10,12 +10,12 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/provider/acme"
"github.com/containous/traefik/testhelpers"
"github.com/containous/traefik/types"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/provider/acme"
"github.com/traefik/traefik/testhelpers"
"github.com/traefik/traefik/types"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/basic_test.go
View File

@@ -8,8 +8,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/constraint_test.go
View File

@@ -5,9 +5,9 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/consul_catalog_test.go
View File

@@ -6,10 +6,10 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/provider/label"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/provider/label"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

6
integration/consul_test.go
View File

@@ -14,10 +14,10 @@ import (
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/consul" "github.com/abronan/valkeyrie/store/consul"
"github.com/containous/staert" "github.com/containous/staert"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/types"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/cluster"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/types"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

6
integration/docker_compose_test.go
View File

@@ -7,10 +7,10 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/testhelpers"
"github.com/containous/traefik/types"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/testhelpers"
"github.com/traefik/traefik/types"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/docker_test.go
View File

@@ -9,12 +9,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/provider/label"
"github.com/docker/docker/pkg/namesgenerator" "github.com/docker/docker/pkg/namesgenerator"
"github.com/go-check/check" "github.com/go-check/check"
d "github.com/libkermit/docker" d "github.com/libkermit/docker"
"github.com/libkermit/docker-check" "github.com/libkermit/docker-check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/provider/label"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/dynamodb_test.go
View File

@@ -10,9 +10,9 @@ import (
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/dynamodb"
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute" "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/types"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/types"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/error_pages_test.go
View File

@@ -5,8 +5,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/etcd3_test.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3" etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/etcd_test.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/etcd/v2" "github.com/abronan/valkeyrie/store/etcd/v2"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/eureka_test.go
View File

@@ -8,8 +8,8 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/fake_dns_server.go
View File

@@ -5,8 +5,8 @@ import (
"net" "net"
"os" "os"
"github.com/containous/traefik/log"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/traefik/traefik/log"
) )
type handler struct{} type handler struct{}

2
integration/file_test.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/grpc_test.go
View File

@@ -11,9 +11,9 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/helloworld"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/helloworld"
"github.com/traefik/traefik/integration/try"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
) )

2
integration/healthcheck_test.go
View File

@@ -6,8 +6,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/hostresolver_test.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

6
integration/https_test.go
View File

@@ -11,10 +11,10 @@ import (
"time" "time"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/containous/traefik/integration/try"
traefiktls "github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
traefiktls "github.com/traefik/traefik/tls"
"github.com/traefik/traefik/types"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/integration_test.go
View File

@@ -13,9 +13,9 @@ import (
"testing" "testing"
"text/template" "text/template"
"github.com/containous/traefik/log"
"github.com/go-check/check" "github.com/go-check/check"
compose "github.com/libkermit/compose/check" compose "github.com/libkermit/compose/check"
"github.com/traefik/traefik/log"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/log_rotation_test.go
View File

@@ -10,8 +10,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/marathon15_test.go
View File

@@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/provider/label"
"github.com/gambol99/go-marathon" "github.com/gambol99/go-marathon"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/provider/label"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

4
integration/marathon_test.go
View File

@@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/provider/label"
"github.com/gambol99/go-marathon" "github.com/gambol99/go-marathon"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
"github.com/traefik/traefik/provider/label"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/mesos_test.go
View File

@@ -4,8 +4,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/proxy_protocol_test.go
View File

@@ -5,8 +5,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/ratelimit_test.go
View File

@@ -5,8 +5,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

8
integration/resources/compose/etcd.yml
View File

@@ -2,13 +2,13 @@ etcd:
image: containous/docker-etcd image: containous/docker-etcd
whoami1: whoami1:
image: emilevauge/whoami image: traefik/whoami
whoami2: whoami2:
image: emilevauge/whoami image: traefik/whoami
whoami3: whoami3:
image: emilevauge/whoami image: traefik/whoami
whoami4: whoami4:
image: emilevauge/whoami image: traefik/whoami

2
integration/resources/compose/tlsclientheaders.yml
View File

@@ -1,5 +1,5 @@
whoami: whoami:
image: containous/whoami image: traefik/whoami
labels: labels:
- traefik.frontend.passTLSClientCert.pem=true - traefik.frontend.passTLSClientCert.pem=true
- traefik.frontend.rule=PathPrefix:/ - traefik.frontend.rule=PathPrefix:/

2
integration/retry_test.go
View File

@@ -5,9 +5,9 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/timeout_test.go
View File

@@ -6,8 +6,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/tls_client_headers_test.go
View File

@@ -7,8 +7,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/tracing_test.go
View File

@@ -5,8 +5,8 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )

2
integration/try/try.go
View File

@@ -7,7 +7,7 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/log" "github.com/traefik/traefik/log"
) )
const ( const (

2
integration/websocket_test.go
View File

@@ -11,9 +11,9 @@ import (
"os" "os"
"time" "time"
"github.com/containous/traefik/integration/try"
"github.com/go-check/check" "github.com/go-check/check"
gorillawebsocket "github.com/gorilla/websocket" gorillawebsocket "github.com/gorilla/websocket"
"github.com/traefik/traefik/integration/try"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
) )

6
metrics/datadog.go
View File

@@ -3,11 +3,11 @@ package metrics
import ( import (
"time" "time"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
kitlog "github.com/go-kit/kit/log" kitlog "github.com/go-kit/kit/log"
"github.com/go-kit/kit/metrics/dogstatsd" "github.com/go-kit/kit/metrics/dogstatsd"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
) )
var datadogClient = dogstatsd.New("traefik.", kitlog.LoggerFunc(func(keyvals ...interface{}) error { var datadogClient = dogstatsd.New("traefik.", kitlog.LoggerFunc(func(keyvals ...interface{}) error {

2
metrics/datadog_test.go
View File

@@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/containous/traefik/types"
"github.com/stvp/go-udp-testing" "github.com/stvp/go-udp-testing"
"github.com/traefik/traefik/types"
) )
func TestDatadog(t *testing.T) { func TestDatadog(t *testing.T) {

6
metrics/influxdb.go
View File

@@ -7,12 +7,12 @@ import (
"regexp" "regexp"
"time" "time"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
kitlog "github.com/go-kit/kit/log" kitlog "github.com/go-kit/kit/log"
"github.com/go-kit/kit/metrics/influx" "github.com/go-kit/kit/metrics/influx"
influxdb "github.com/influxdata/influxdb/client/v2" influxdb "github.com/influxdata/influxdb/client/v2"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
) )
var influxDBClient *influx.Influx var influxDBClient *influx.Influx

2
metrics/influxdb_test.go
View File

@@ -10,8 +10,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/containous/traefik/types"
"github.com/stvp/go-udp-testing" "github.com/stvp/go-udp-testing"
"github.com/traefik/traefik/types"
) )
func TestInfluxDB(t *testing.T) { func TestInfluxDB(t *testing.T) {

6
metrics/prometheus.go
View File

@@ -7,12 +7,12 @@ import (
"sync" "sync"
"github.com/containous/mux" "github.com/containous/mux"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/go-kit/kit/metrics" "github.com/go-kit/kit/metrics"
stdprometheus "github.com/prometheus/client_golang/prometheus" stdprometheus "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
) )
const ( const (

4
metrics/prometheus_test.go
View File

@@ -7,11 +7,11 @@ import (
"testing" "testing"
"time" "time"
th "github.com/containous/traefik/testhelpers"
"github.com/containous/traefik/types"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
th "github.com/traefik/traefik/testhelpers"
"github.com/traefik/traefik/types"
) )
func TestRegisterPromState(t *testing.T) { func TestRegisterPromState(t *testing.T) {

6
metrics/statsd.go
View File

@@ -3,11 +3,11 @@ package metrics
import ( import (
"time" "time"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
kitlog "github.com/go-kit/kit/log" kitlog "github.com/go-kit/kit/log"
"github.com/go-kit/kit/metrics/statsd" "github.com/go-kit/kit/metrics/statsd"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
) )
var statsdClient = statsd.New("traefik.", kitlog.LoggerFunc(func(keyvals ...interface{}) error { var statsdClient = statsd.New("traefik.", kitlog.LoggerFunc(func(keyvals ...interface{}) error {

2
metrics/statsd_test.go
View File

@@ -5,8 +5,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/containous/traefik/types"
"github.com/stvp/go-udp-testing" "github.com/stvp/go-udp-testing"
"github.com/traefik/traefik/types"
) )
func TestStatsD(t *testing.T) { func TestStatsD(t *testing.T) {

Some files were not shown because too many files have changed in this diff Show More