diff --git a/README.md b/README.md index d0a664e..1b6cfdc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ ![IIS Docker Image](https://avatars2.githubusercontent.com/u/6154722?v=3&s=200) # IIS Docker Image +# Supported Windows Server, version 1903 amd64 tags + + `docker pull mcr.microsoft.com/windows/servercore/iis:windowsservercore-1903` + + [`windowsservercore-1903, latest` (*windowsserver/Dockerfile*)](https://github.com/Microsoft/iis-docker/blob/master/windowsservercore-1903/Dockerfile) + # Supported Windows Server 2019 amd64 tags `docker pull mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2019` @@ -13,20 +19,12 @@ [`windowsservercore-1803, latest` (*windowsserver/Dockerfile*)](https://github.com/Microsoft/iis-docker/blob/master/windowsservercore-1803/Dockerfile) -# Supported Windows Server, version 1709 amd64 tags - - `docker pull mcr.microsoft.com/windows/servercore/iis:windowsservercore-1709` - - [`windowsservercore-1709, latest` (*windowsserver/Dockerfile*)](https://github.com/Microsoft/iis-docker/blob/master/windowsservercore-1709/Dockerfile) - # Supported Windows Server 2016 amd64 tags `docker pull mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2016` [`windowsservercore-ltsc2016, latest` (*windowsserver/Dockerfile*)](https://github.com/Microsoft/iis-docker/blob/master/windowsservercore-ltsc2016/Dockerfile) - `docker pull mcr.microsoft.com/windows/servercore/iis:nanoserver-sac2016` - ## What is IIS? Internet Information Services (IIS) for Windows® Server is a flexible, secure and manageable Web server for hosting anything on the Web. diff --git a/nanoserver-sac2016/Dockerfile b/nanoserver-sac2016/Dockerfile deleted file mode 100644 index beca645..0000000 --- a/nanoserver-sac2016/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# escape=` -FROM microsoft/nanoserver:sac2016 - -RUN powershell -NoProfile -Command ` - New-Item -Type Directory C:\install; ` - Invoke-WebRequest https://az880830.vo.msecnd.net/nanoserver-ga-2016/Microsoft-NanoServer-IIS-Package_base_10-0-14393-0.cab -OutFile C:\install\Microsoft-NanoServer-IIS-Package_base_10-0-14393-0.cab; ` - Invoke-WebRequest https://az880830.vo.msecnd.net/nanoserver-ga-2016/Microsoft-NanoServer-IIS-Package_English_10-0-14393-0.cab -OutFile C:\install\Microsoft-NanoServer-IIS-Package_English_10-0-14393-0.cab; ` - dism.exe /online /add-package /packagepath:c:\install\Microsoft-NanoServer-IIS-Package_base_10-0-14393-0.cab & ` - dism.exe /online /add-package /packagepath:c:\install\Microsoft-NanoServer-IIS-Package_English_10-0-14393-0.cab & ` - dism.exe /online /add-package /packagepath:c:\install\Microsoft-NanoServer-IIS-Package_base_10-0-14393-0.cab & ;` - powershell -NoProfile -Command ` - Remove-Item -Recurse C:\install\ ; ` - Invoke-WebRequest https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.6/ServiceMonitor.exe -OutFile C:\ServiceMonitor.exe; ` - Start-Service Was; ` - While ((Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Services\WAS\Parameters\ -Name NanoSetup -ErrorAction Ignore) -ne $null) {Start-Sleep 1} - -EXPOSE 80 - -ENTRYPOINT ["C:\\ServiceMonitor.exe", "w3svc"] diff --git a/windowsservercore-1803/Dockerfile b/windowsservercore-1803/Dockerfile index 6be6407..019f272 100644 --- a/windowsservercore-1803/Dockerfile +++ b/windowsservercore-1803/Dockerfile @@ -1,5 +1,5 @@ # escape=` -FROM microsoft/windowsservercore:1803 +FROM mcr.microsoft.com/windows/servercore:1803 RUN powershell -Command ` Add-WindowsFeature Web-Server; ` diff --git a/windowsservercore-1709/Dockerfile b/windowsservercore-1903/Dockerfile similarity index 86% rename from windowsservercore-1709/Dockerfile rename to windowsservercore-1903/Dockerfile index b4fde7b..e905cb0 100644 --- a/windowsservercore-1709/Dockerfile +++ b/windowsservercore-1903/Dockerfile @@ -1,5 +1,5 @@ # escape=` -FROM microsoft/windowsservercore:1709 +FROM mcr.microsoft.com/windows/servercore:1903 RUN powershell -Command ` Add-WindowsFeature Web-Server; ` diff --git a/windowsservercore-insider/Dockerfile b/windowsservercore-insider/Dockerfile index 52e9362..b31d6c8 100644 --- a/windowsservercore-insider/Dockerfile +++ b/windowsservercore-insider/Dockerfile @@ -1,5 +1,6 @@ # escape=` -FROM microsoft/windowsservercore-insider:latest +FROM mcr.microsoft.com/windows/insider:10.0.18362.113 + RUN powershell -Command ` Add-WindowsFeature Web-Server; ` diff --git a/windowsservercore-ltsc2016/Dockerfile b/windowsservercore-ltsc2016/Dockerfile index ed99781..6e73573 100644 --- a/windowsservercore-ltsc2016/Dockerfile +++ b/windowsservercore-ltsc2016/Dockerfile @@ -1,5 +1,5 @@ # escape=` -FROM microsoft/windowsservercore:ltsc2016 +FROM mcr.microsoft.com/windows/servercore:ltsc2016 RUN powershell -Command ` Add-WindowsFeature Web-Server; `