Use stable tags in our Windows Docker images (#6072)

This change updates the Dockerfiles for our Windows images to use stable nanoserver tags. It also removes all Windows arm32v7 Dockerfiles.
Azure · Feb 3, 2022 · 0ac3602 · 0ac3602
1 parent 20d7e11
commit 0ac3602
Show file tree

Hide file tree

Showing 44 changed files with 21 additions and 304 deletions.
diff --git a/edge-agent/docker/windows/amd64/Dockerfile b/edge-agent/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 # In order to set system PATH, ContainerAdministrator must be used

diff --git a/edge-agent/docker/windows/arm32v7/Dockerfile b/edge-agent/docker/windows/arm32v7/Dockerfile
diff --git a/edge-agent/docker/windows/arm32v7/base/Dockerfile b/edge-agent/docker/windows/arm32v7/base/Dockerfile
diff --git a/edge-hub/docker/windows/amd64/Dockerfile b/edge-hub/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-hub/docker/windows/arm32v7/Dockerfile b/edge-hub/docker/windows/arm32v7/Dockerfile
diff --git a/edge-hub/docker/windows/arm32v7/base/Dockerfile b/edge-hub/docker/windows/arm32v7/base/Dockerfile
diff --git a/edge-modules/MetricsCollector/docker/windows/amd64/Dockerfile b/edge-modules/MetricsCollector/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/MetricsCollector/docker/windows/arm32v7/Dockerfile b/edge-modules/MetricsCollector/docker/windows/arm32v7/Dockerfile
diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/amd64/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/Dockerfile
diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/base/Dockerfile
diff --git a/edge-modules/azure-monitor/docker/windows/amd64/Dockerfile b/edge-modules/azure-monitor/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/iotedge-diagnostics-dotnet/docker/windows/amd64/Dockerfile b/edge-modules/iotedge-diagnostics-dotnet/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/iotedge-diagnostics-dotnet/docker/windows/arm32v7/Dockerfile b/edge-modules/iotedge-diagnostics-dotnet/docker/windows/arm32v7/Dockerfile
diff --git a/test/connectivity/modules/NetworkController/docker/windows/amd64/Dockerfile b/test/connectivity/modules/NetworkController/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/connectivity/modules/NetworkController/docker/windows/arm32v7/Dockerfile b/test/connectivity/modules/NetworkController/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/CloudToDeviceMessageTester/docker/windows/amd64/Dockerfile b/test/modules/CloudToDeviceMessageTester/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ENV MODULE_NAME "CloudToDeviceMessageTester.dll"

diff --git a/test/modules/CloudToDeviceMessageTester/docker/windows/arm32v7/Dockerfile b/test/modules/CloudToDeviceMessageTester/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/DeploymentTester/docker/windows/amd64/Dockerfile b/test/modules/DeploymentTester/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ENV MODULE_NAME "DeploymentTester.dll"

diff --git a/test/modules/DeploymentTester/docker/windows/arm32v7/Dockerfile b/test/modules/DeploymentTester/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/DirectMethodReceiver/docker/windows/amd64/Dockerfile b/test/modules/DirectMethodReceiver/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/DirectMethodReceiver/docker/windows/arm32v7/Dockerfile b/test/modules/DirectMethodReceiver/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/DirectMethodSender/docker/windows/amd64/Dockerfile b/test/modules/DirectMethodSender/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/DirectMethodSender/docker/windows/arm32v7/Dockerfile b/test/modules/DirectMethodSender/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/EdgeHubRestartTester/docker/windows/amd64/Dockerfile b/test/modules/EdgeHubRestartTester/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/EdgeHubRestartTester/docker/windows/arm32v7/Dockerfile b/test/modules/EdgeHubRestartTester/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/MetricsValidator/docker/windows/amd64/Dockerfile b/test/modules/MetricsValidator/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/MetricsValidator/docker/windows/arm32v7/Dockerfile b/test/modules/MetricsValidator/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/ModuleRestarter/docker/windows/amd64/Dockerfile b/test/modules/ModuleRestarter/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/ModuleRestarter/docker/windows/arm32v7/Dockerfile b/test/modules/ModuleRestarter/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/NumberLogger/docker/windows/amd64/Dockerfile b/test/modules/NumberLogger/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/NumberLogger/docker/windows/arm32v7/Dockerfile b/test/modules/NumberLogger/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/Relayer/docker/windows/amd64/Dockerfile b/test/modules/Relayer/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ENV MODULE_NAME "Relayer.dll"

diff --git a/test/modules/Relayer/docker/windows/arm32v7/Dockerfile b/test/modules/Relayer/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/TemperatureFilter/docker/windows/amd64/Dockerfile b/test/modules/TemperatureFilter/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/TemperatureFilter/docker/windows/arm32v7/Dockerfile b/test/modules/TemperatureFilter/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/TestAnalyzer/docker/windows/amd64/Dockerfile b/test/modules/TestAnalyzer/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/test/modules/TestAnalyzer/docker/windows/arm32v7/Dockerfile b/test/modules/TestAnalyzer/docker/windows/arm32v7/Dockerfile
diff --git a/test/modules/TestResultCoordinator/docker/windows/amd64/Dockerfile b/test/modules/TestResultCoordinator/docker/windows/amd64/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.1.19-nanoserver-1809
+ARG base_tag=3.1-nanoserver-1809
 FROM mcr.microsoft.com/dotnet/aspnet:${base_tag}
 
 ARG EXE_DIR=.