From 070ec65daf223a355bbb4738357ec4368af4f24a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 11 Apr 2019 16:13:50 -0700 Subject: [PATCH] Remove Windows 1709 (EOL) https://twitter.com/thaJeztah/status/1116392901267927041 --- Makefile | 1 - .../hello-seattle/nanoserver-1709/Dockerfile | 3 --- amd64/hello-seattle/nanoserver-1709/hello.txt | 22 ------------------- amd64/hello-world/nanoserver-1709/Dockerfile | 3 --- amd64/hello-world/nanoserver-1709/hello.txt | 22 ------------------- amd64/hola-mundo/nanoserver-1709/Dockerfile | 3 --- amd64/hola-mundo/nanoserver-1709/hello.txt | 22 ------------------- generate-stackbrew-library.sh | 2 +- 8 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 amd64/hello-seattle/nanoserver-1709/Dockerfile delete mode 100644 amd64/hello-seattle/nanoserver-1709/hello.txt delete mode 100644 amd64/hello-world/nanoserver-1709/Dockerfile delete mode 100644 amd64/hello-world/nanoserver-1709/hello.txt delete mode 100644 amd64/hola-mundo/nanoserver-1709/Dockerfile delete mode 100644 amd64/hola-mundo/nanoserver-1709/hello.txt diff --git a/Makefile b/Makefile index bb13c25..20eabe8 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ $(C_TARGETS): hello.c @if [ '$(TARGET_ARCH)' = 'amd64' ]; then \ for winVariant in \ nanoserver-sac2016 \ - nanoserver-1709 \ nanoserver-1803 \ nanoserver-1809 \ ; do \ diff --git a/amd64/hello-seattle/nanoserver-1709/Dockerfile b/amd64/hello-seattle/nanoserver-1709/Dockerfile deleted file mode 100644 index 895df26..0000000 --- a/amd64/hello-seattle/nanoserver-1709/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM mcr.microsoft.com/windows/nanoserver:1709 -COPY hello.txt C: -CMD ["cmd", "/C", "type C:\\hello.txt"] diff --git a/amd64/hello-seattle/nanoserver-1709/hello.txt b/amd64/hello-seattle/nanoserver-1709/hello.txt deleted file mode 100644 index 883cfba..0000000 --- a/amd64/hello-seattle/nanoserver-1709/hello.txt +++ /dev/null @@ -1,22 +0,0 @@ - -Hello from DockerCon 2016 (Seattle)! -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-seattle" image from the Docker Hub. - (windows-amd64, nanoserver-1709) - 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/amd64/hello-world/nanoserver-1709/Dockerfile b/amd64/hello-world/nanoserver-1709/Dockerfile deleted file mode 100644 index 895df26..0000000 --- a/amd64/hello-world/nanoserver-1709/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM mcr.microsoft.com/windows/nanoserver:1709 -COPY hello.txt C: -CMD ["cmd", "/C", "type C:\\hello.txt"] diff --git a/amd64/hello-world/nanoserver-1709/hello.txt b/amd64/hello-world/nanoserver-1709/hello.txt deleted file mode 100644 index 6b5006f..0000000 --- a/amd64/hello-world/nanoserver-1709/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-1709) - 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/amd64/hola-mundo/nanoserver-1709/Dockerfile b/amd64/hola-mundo/nanoserver-1709/Dockerfile deleted file mode 100644 index 895df26..0000000 --- a/amd64/hola-mundo/nanoserver-1709/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM mcr.microsoft.com/windows/nanoserver:1709 -COPY hello.txt C: -CMD ["cmd", "/C", "type C:\\hello.txt"] diff --git a/amd64/hola-mundo/nanoserver-1709/hello.txt b/amd64/hola-mundo/nanoserver-1709/hello.txt deleted file mode 100644 index f1f33c7..0000000 --- a/amd64/hola-mundo/nanoserver-1709/hello.txt +++ /dev/null @@ -1,22 +0,0 @@ - -¡Hola de DockerCon EU 2015 (Barcelona)! -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 "hola-mundo" image from the Docker Hub. - (windows-amd64, nanoserver-1709) - 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 6a11cd1..5946ab9 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-{sac2016,1709,1803,1809}; do +for winVariant in nanoserver-{sac2016,1803,1809}; do winArches=( *"/$image/$winVariant/hello.txt" ) winArches=( "${winArches[@]%"/$image/$winVariant/hello.txt"}" )