From 837f63a4a9cc1e06320f47abb98965b6c5672b30 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 9 Dec 2019 14:31:33 -0800
Subject: [PATCH] Remove EOL Windows 1803-based (SAC) images

See https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/base-image-lifecycle (EOL 11/12/2019)
---
 Makefile                                     |  1 -
 amd64/hello-world/nanoserver-1803/Dockerfile |  3 ---
 amd64/hello-world/nanoserver-1803/hello.txt  | 22 --------------------
 generate-stackbrew-library.sh                |  2 +-
 4 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 amd64/hello-world/nanoserver-1803/Dockerfile
 delete mode 100644 amd64/hello-world/nanoserver-1803/hello.txt

diff --git a/Makefile b/Makefile
index e821d37..ff0cb53 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,6 @@ $(C_TARGETS): hello.c
 	$(STRIP) -R .comment -s '$@'
 	@if [ '$(TARGET_ARCH)' = 'amd64' ]; then \
 		for winVariant in \
-			nanoserver-1803 \
 			nanoserver-1809 \
 		; do \
 			mkdir -p "$(@D)/$$winVariant"; \
diff --git a/amd64/hello-world/nanoserver-1803/Dockerfile b/amd64/hello-world/nanoserver-1803/Dockerfile
deleted file mode 100644
index e336da2..0000000
--- a/amd64/hello-world/nanoserver-1803/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM mcr.microsoft.com/windows/nanoserver:1803
-COPY hello.txt C:
-CMD ["cmd", "/C", "type C:\\hello.txt"]
diff --git a/amd64/hello-world/nanoserver-1803/hello.txt b/amd64/hello-world/nanoserver-1803/hello.txt
deleted file mode 100644
index f6acab6..0000000
--- a/amd64/hello-world/nanoserver-1803/hello.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Hello from Docker!
-This message shows that your installation appears to be working correctly.
-
-To generate this message, Docker took the following steps:
- 1. The Docker client contacted the Docker daemon.
- 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-    (windows-amd64, nanoserver-1803)
- 3. The Docker daemon created a new container from that image which runs the
-    executable that produces the output you are currently reading.
- 4. The Docker daemon streamed that output to the Docker client, which sent it
-    to your terminal.
-
-To try something more ambitious, you can run a Windows Server container with:
- PS C:\> docker run -it mcr.microsoft.com/windows/servercore powershell
-
-Share images, automate workflows, and more with a free Docker ID:
- https://hub.docker.com/
-
-For more examples and ideas, visit:
- https://docs.docker.com/get-started/
-
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 2e9d690..5791e6b 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -62,7 +62,7 @@ for arch in "${arches[@]}"; do
 	EOE
 done
 
-for winVariant in nanoserver-{1803,1809}; do
+for winVariant in nanoserver-1809; do
 	winArches=( *"/$image/$winVariant/hello.txt" )
 	winArches=( "${winArches[@]%"/$image/$winVariant/hello.txt"}" )