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

8
provider/docker/config.go
View File

@@ -11,11 +11,11 @@ import (
"text/template"
"github.com/BurntSushi/ty/fun"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
"github.com/docker/go-connections/nat"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/provider"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
const (

4
provider/docker/config_container_docker_test.go
View File

@@ -6,13 +6,13 @@ import (
"time"
"github.com/containous/flaeg"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestDockerBuildConfiguration(t *testing.T) {

4
provider/docker/config_container_swarm_test.go
View File

@@ -6,12 +6,12 @@ import (
"time"
"github.com/containous/flaeg"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestSwarmBuildConfiguration(t *testing.T) {

2
provider/docker/config_root.go
View File

@@ -1,7 +1,7 @@
package docker
import (
"github.com/containous/traefik/types"
"github.com/traefik/traefik/types"
)
func (p *Provider) buildConfiguration(containersInspected []dockerData) *types.Configuration {

4
provider/docker/config_segment_test.go
View File

@@ -5,12 +5,12 @@ import (
"time"
"github.com/containous/flaeg"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/go-connections/nat"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestSegmentBuildConfiguration(t *testing.T) {

6
provider/docker/deprecated_config.go
View File

@@ -8,9 +8,9 @@ import (
"text/template"
"github.com/BurntSushi/ty/fun"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
// Deprecated

6
provider/docker/deprecated_container.go
View File

@@ -6,10 +6,10 @@ import (
"strconv"
"strings"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/label"
"github.com/docker/go-connections/nat"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/provider"
"github.com/traefik/traefik/provider/label"
)
// Specific functions

4
provider/docker/deprecated_container_docker_test.go
View File

@@ -5,13 +5,13 @@ import (
"strconv"
"testing"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestDockerBuildConfigurationV1(t *testing.T) {

4
provider/docker/deprecated_container_swarm_test.go
View File

@@ -4,12 +4,12 @@ import (
"strconv"
"testing"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestSwarmBuildConfigurationV1(t *testing.T) {

4
provider/docker/deprecated_service.go
View File

@@ -5,8 +5,8 @@ import (
"strconv"
"strings"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/label"
"github.com/traefik/traefik/provider"
"github.com/traefik/traefik/provider/label"
)
// Specific functions

4
provider/docker/deprecated_service_test.go
View File

@@ -5,12 +5,12 @@ import (
"strconv"
"testing"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/types"
docker "github.com/docker/docker/api/types"
"github.com/docker/go-connections/nat"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/provider/label"
"github.com/traefik/traefik/types"
)
func TestDockerServiceBuildConfigurationV1(t *testing.T) {

14
provider/docker/docker.go
View File

@@ -10,12 +10,6 @@ import (
"time"
"github.com/cenk/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
dockertypes "github.com/docker/docker/api/types"
dockercontainertypes "github.com/docker/docker/api/types/container"
eventtypes "github.com/docker/docker/api/types/events"
@@ -25,6 +19,12 @@ import (
"github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/docker/go-connections/sockets"
"github.com/traefik/traefik/job"
"github.com/traefik/traefik/log"
"github.com/traefik/traefik/provider"
"github.com/traefik/traefik/safe"
"github.com/traefik/traefik/types"
"github.com/traefik/traefik/version"
)
const (
@@ -282,7 +282,7 @@ func inspectContainers(ctx context.Context, dockerClient client.ContainerAPIClie
if err != nil {
log.Warnf("Failed to inspect container %s, error: %s", containerID, err)
} else {
// This condition is here to avoid to have empty IP https://github.com/containous/traefik/issues/2459
// This condition is here to avoid to have empty IP https://github.com/traefik/traefik/issues/2459
// We register only container which are running
if containerInspected.ContainerJSONBase != nil && containerInspected.ContainerJSONBase.State != nil && containerInspected.ContainerJSONBase.State.Running {
dData = parseContainer(containerInspected)