homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge back v2.11 into v3.0

Browse source
This commit is contained in:
mmatur 2024-01-19 16:03:50 +01:00
commit f57cee578f
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
8 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
integration/integration_test.go
View file

@ -37,6 +37,8 @@ import (
var showLog = flag.Bool("tlog", false, "always show Traefik logs")
const tailscaleSecretFilePath = "tailscale.secret"
type composeConfig struct {
Services map[string]composeService `yaml:"services"`
}
@ -99,6 +101,11 @@ func (s *BaseSuite) displayTraefikLogFile(path string) {
}
func (s *BaseSuite) SetupSuite() {
if isDockerDesktop(context.Background(), s.T()) {
_, err := os.Stat(tailscaleSecretFilePath)
require.NoError(s.T(), err, "Tailscale need to be configured when running integration tests with Docker Desktop: (https://doc.traefik.io/traefik/v2.11/contributing/building-testing/#testing)")
}
// configure default standard log.
stdlog.SetFlags(stdlog.Lshortfile | stdlog.LstdFlags)
// TODO
@ -124,7 +131,7 @@ func (s *BaseSuite) SetupSuite() {
s.hostIP = "172.31.42.1"
if isDockerDesktop(ctx, s.T()) {
s.hostIP = getDockerDesktopHostIP(ctx, s.T())
s.setupVPN("tailscale.secret")
s.setupVPN(tailscaleSecretFilePath)
}
}