homelab/traefik
1
0
Fork 0
Code Activity

Merge branch v2.11 into v3.6

Browse source
This commit is contained in:
kevinpollet 2025-11-13 10:54:22 +01:00
commit 67fef270af
No known key found for this signature in database
GPG key ID: 0C9A5DDD1B292453
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,3 +1,9 @@
## [v2.11.31](https://github.com/traefik/traefik/tree/v2.11.31) (2025-11-13)
[All Commits](https://github.com/traefik/traefik/compare/v2.11.30...v2.11.31)
**Bug fixes:**
- **[docker,docker/swarm]** Auto-negotiate Docker API version ([#12262](https://github.com/traefik/traefik/pull/12262) by [kevinpollet](https://github.com/kevinpollet))
## [v3.6.0](https://github.com/traefik/traefik/tree/v3.6.0) (2025-11-07)
[All Commits](https://github.com/traefik/traefik/compare/v3.5.0-rc1...v3.6.0)

5
pkg/provider/docker/shared.go
View file

@ -121,8 +121,9 @@ func createClient(ctx context.Context, cfg ClientConfig) (*client.Client, error)
}
opts = append(opts,
client.WithHTTPHeaders(httpHeaders),
client.WithAPIVersionNegotiation())
client.FromEnv,
client.WithAPIVersionNegotiation(),
client.WithHTTPHeaders(httpHeaders))
return client.NewClientWithOpts(opts...)
}