浏览代码

Merge pull request #8336 from ldez/feat/traefik-v2.2.4

Bump Traefik to v2.2.4
yosifkit 5 年之前
父节点
当前提交
414a92deaf
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 4 4
      library/traefik
  2. 3 0
      test/config.sh

+ 4 - 4
library/traefik

@@ -1,13 +1,13 @@
 Maintainers: Emile Vauge <[email protected]> (@emilevauge), Vincent Demeester <[email protected]> (@vdemeester), Ludovic Fernandez <[email protected]> (@ldez), Julien Salleyron <[email protected]> (@juliens), Nicolas Mengin <[email protected]> (@nmengin), Michael Matur <[email protected]> (@mmatur)
 GitRepo: https://github.com/containous/traefik-library-image.git
 
-Tags: v2.2.2-windowsservercore-1809, 2.2.2-windowsservercore-1809, v2.2-windowsservercore-1809, 2.2-windowsservercore-1809, chevrotin-windowsservercore-1809, windowsservercore-1809
+Tags: v2.2.4-windowsservercore-1809, 2.2.4-windowsservercore-1809, v2.2-windowsservercore-1809, 2.2-windowsservercore-1809, chevrotin-windowsservercore-1809, windowsservercore-1809
 Architectures: windows-amd64
-GitCommit: 296caddf8ba97b52841872b2192758af9e9d7775
+GitCommit: f3987516ba5bf9051d7ea16dfffed4af58cfb765
 Directory: windows/1809
 Constraints: windowsservercore-1809
 
-Tags: v2.2.2, 2.2.2, v2.2, 2.2, chevrotin, latest
+Tags: v2.2.4, 2.2.4, v2.2, 2.2, chevrotin, latest
 Architectures: amd64, arm32v6, arm64v8
-GitCommit: 296caddf8ba97b52841872b2192758af9e9d7775
+GitCommit: f3987516ba5bf9051d7ea16dfffed4af58cfb765
 Directory: alpine

+ 3 - 0
test/config.sh

@@ -308,6 +308,9 @@ globalExcludeTests+=(
 	[nats-streaming:nanoserver_override-cmd]=1
 	[nats-streaming:windowsservercore_override-cmd]=1
 
+	# https://github.com/docker-library/official-images/pull/8329#issuecomment-656383836
+	[traefik:windowsservercore_override-cmd]=1
+
 	# TODO adjust MongoDB tests to use docker networks instead of links so they can work on Windows (and consider using PowerShell to generate appropriate certificates for TLS tests instead of openssl)
 	[mongo:windowsservercore_mongo-basics]=1
 	[mongo:windowsservercore_mongo-auth-basics]=1