diff --git a/2.2/aspnet/alpine3.10/amd64/Dockerfile b/2.2/aspnet/alpine3.10/amd64/Dockerfile deleted file mode 100644 index fb8786c68f..0000000000 --- a/2.2/aspnet/alpine3.10/amd64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.10 - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-musl-x64.tar.gz \ - && aspnetcore_sha512='139d13a067d91b13f90f488cbb36517a0c629e803e15edbb4fb85443641184c4efd8c83110e32c1a1cc578b95f25e38056e680830288665491b568ea3944db3f' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/aspnet/alpine3.9/amd64/Dockerfile b/2.2/aspnet/alpine3.9/amd64/Dockerfile deleted file mode 100644 index 4267124ece..0000000000 --- a/2.2/aspnet/alpine3.9/amd64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.9 - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-musl-x64.tar.gz \ - && aspnetcore_sha512='139d13a067d91b13f90f488cbb36517a0c629e803e15edbb4fb85443641184c4efd8c83110e32c1a1cc578b95f25e38056e680830288665491b568ea3944db3f' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/aspnet/bionic/amd64/Dockerfile b/2.2/aspnet/bionic/amd64/Dockerfile deleted file mode 100644 index 96870b6c6d..0000000000 --- a/2.2/aspnet/bionic/amd64/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-bionic - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-x64.tar.gz \ - && aspnetcore_sha512='954072376698be69acb7e277df2c243f931e10529def21dcbf9ce277609b30d462126bf8b8b3cab36476bec3d63a927b8e44e59e4d4cade23eef45956fba1ffd' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - diff --git a/2.2/aspnet/bionic/arm32v7/Dockerfile b/2.2/aspnet/bionic/arm32v7/Dockerfile deleted file mode 100644 index d5b251e87f..0000000000 --- a/2.2/aspnet/bionic/arm32v7/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-bionic-arm32v7 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-arm.tar.gz \ - && aspnetcore_sha512='fab9a1d9d101716337bb153af2ac36429fc387230c0c0bf2d639b31fb7f787bc8dbaaa31f28f9cbe69f117ffc78d8ddb5a5968da0e77785d3c12c6814ef50f7b' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - diff --git a/2.2/aspnet/nanoserver-1809/amd64/Dockerfile b/2.2/aspnet/nanoserver-1809/amd64/Dockerfile deleted file mode 100644 index 86f04a16aa..0000000000 --- a/2.2/aspnet/nanoserver-1809/amd64/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1809 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Install ASP.NET Core Runtime -ENV ASPNETCORE_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNETCORE_VERSION/aspnetcore-runtime-$Env:ASPNETCORE_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '990c1c0e1db6f59b213f4d94c81c212dc39cbbe6a9ae2a0183c1f7947b447e614ac266d78785d0f0fc0451d32e3d3f0b3e5f7415a52d5c7f2e58db38aedda1d0'; ` - if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive aspnetcore.zip -DestinationPath dotnet; ` - Remove-Item -Force aspnetcore.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1809 - -# Note: Runtime image's SHELL is the CMD shell (different than the installer image). - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/aspnet/nanoserver-1809/arm32v7/Dockerfile b/2.2/aspnet/nanoserver-1809/arm32v7/Dockerfile deleted file mode 100644 index 99921ec88f..0000000000 --- a/2.2/aspnet/nanoserver-1809/arm32v7/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# escape=` - -FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7 - -# Install ASP.NET Core Runtime -ENV ASPNETCORE_VERSION 2.2.8 - -RUN curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/%ASPNETCORE_VERSION%/aspnetcore-runtime-%ASPNETCORE_VERSION%-win-arm.zip ` - && mkdir "%ProgramFiles%\dotnet" ` - && tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" ` - && del dotnet.zip - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;%ProgramFiles%\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/aspnet/nanoserver-1903/amd64/Dockerfile b/2.2/aspnet/nanoserver-1903/amd64/Dockerfile deleted file mode 100644 index 9cf76d6fb9..0000000000 --- a/2.2/aspnet/nanoserver-1903/amd64/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1903 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Install ASP.NET Core Runtime -ENV ASPNETCORE_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNETCORE_VERSION/aspnetcore-runtime-$Env:ASPNETCORE_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '990c1c0e1db6f59b213f4d94c81c212dc39cbbe6a9ae2a0183c1f7947b447e614ac266d78785d0f0fc0451d32e3d3f0b3e5f7415a52d5c7f2e58db38aedda1d0'; ` - if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive aspnetcore.zip -DestinationPath dotnet; ` - Remove-Item -Force aspnetcore.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1903 - -# Note: Runtime image's SHELL is the CMD shell (different than the installer image). - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/aspnet/nanoserver-1909/amd64/Dockerfile b/2.2/aspnet/nanoserver-1909/amd64/Dockerfile deleted file mode 100644 index 185426e54a..0000000000 --- a/2.2/aspnet/nanoserver-1909/amd64/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1909 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Install ASP.NET Core Runtime -ENV ASPNETCORE_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$Env:ASPNETCORE_VERSION/aspnetcore-runtime-$Env:ASPNETCORE_VERSION-win-x64.zip; ` - $aspnetcore_sha512 = '990c1c0e1db6f59b213f4d94c81c212dc39cbbe6a9ae2a0183c1f7947b447e614ac266d78785d0f0fc0451d32e3d3f0b3e5f7415a52d5c7f2e58db38aedda1d0'; ` - if ((Get-FileHash aspnetcore.zip -Algorithm sha512).Hash -ne $aspnetcore_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive aspnetcore.zip -DestinationPath dotnet; ` - Remove-Item -Force aspnetcore.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1909 - -# Note: Runtime image's SHELL is the CMD shell (different than the installer image). - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/aspnet/stretch-slim/amd64/Dockerfile b/2.2/aspnet/stretch-slim/amd64/Dockerfile deleted file mode 100644 index 0f5acecaed..0000000000 --- a/2.2/aspnet/stretch-slim/amd64/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-stretch-slim - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-x64.tar.gz \ - && aspnetcore_sha512='954072376698be69acb7e277df2c243f931e10529def21dcbf9ce277609b30d462126bf8b8b3cab36476bec3d63a927b8e44e59e4d4cade23eef45956fba1ffd' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/aspnet/stretch-slim/arm32v7/Dockerfile b/2.2/aspnet/stretch-slim/arm32v7/Dockerfile deleted file mode 100644 index 95176070a6..0000000000 --- a/2.2/aspnet/stretch-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-stretch-slim-arm32v7 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install ASP.NET Core -ENV ASPNETCORE_VERSION 2.2.8 - -RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-arm.tar.gz \ - && aspnetcore_sha512='fab9a1d9d101716337bb153af2ac36429fc387230c0c0bf2d639b31fb7f787bc8dbaaa31f28f9cbe69f117ffc78d8ddb5a5968da0e77785d3c12c6814ef50f7b' \ - && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \ - && rm aspnetcore.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/runtime/alpine3.10/amd64/Dockerfile b/2.2/runtime/alpine3.10/amd64/Dockerfile deleted file mode 100644 index 869b2d8e61..0000000000 --- a/2.2/runtime/alpine3.10/amd64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.10 - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='d0f8e7ac385e7fcaca2a70b1081625be88289e06f031ce12955f0d6df0b6ff2f13e6d93287e30439bb19932b2a06a9d1162577579c9c85da435c4036c609659a' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - && rm dotnet.tar.gz diff --git a/2.2/runtime/alpine3.9/amd64/Dockerfile b/2.2/runtime/alpine3.9/amd64/Dockerfile deleted file mode 100644 index 1386c49dcf..0000000000 --- a/2.2/runtime/alpine3.9/amd64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.9 - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='d0f8e7ac385e7fcaca2a70b1081625be88289e06f031ce12955f0d6df0b6ff2f13e6d93287e30439bb19932b2a06a9d1162577579c9c85da435c4036c609659a' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - && rm dotnet.tar.gz diff --git a/2.2/runtime/bionic/amd64/Dockerfile b/2.2/runtime/bionic/amd64/Dockerfile deleted file mode 100644 index 18427ebc11..0000000000 --- a/2.2/runtime/bionic/amd64/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-bionic - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='b818557b0090ec047be0fb2e5ffee212e23e8417e1b0164f455e3a880bf5b94967dc4c86d6ed82397af9acc1f7415674904f6225a1abff85d28d2a6d5de8073b' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/runtime/bionic/arm32v7/Dockerfile b/2.2/runtime/bionic/arm32v7/Dockerfile deleted file mode 100644 index 959d35e7d6..0000000000 --- a/2.2/runtime/bionic/arm32v7/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-bionic-arm32v7 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='a3fb720504821eca64ec507e4ae2e321b3119c90f7b14844db85026d386047e1cfdf6f24b07f5fae6f19af9ed7ccbe49e46a39ad16d0c3838d9e9589bf2d5ef9' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/runtime/nanoserver-1809/amd64/Dockerfile b/2.2/runtime/nanoserver-1809/amd64/Dockerfile deleted file mode 100644 index b563da7458..0000000000 --- a/2.2/runtime/nanoserver-1809/amd64/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1809 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core Runtime -ENV DOTNET_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = '5864a40f662388761bc108510df9540b0b6672ae0f5a04cac71112ef0d1aa5781ffa3c856e919eed68eba6161f21a38c52f0e8850e8ecdf22609c42d2387d848'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1809 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/runtime/nanoserver-1809/arm32v7/Dockerfile b/2.2/runtime/nanoserver-1809/arm32v7/Dockerfile deleted file mode 100644 index d13c3cce99..0000000000 --- a/2.2/runtime/nanoserver-1809/arm32v7/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# escape=` - -FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7 - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/%DOTNET_VERSION%/dotnet-runtime-%DOTNET_VERSION%-win-arm.zip ` - && mkdir "%ProgramFiles%\dotnet" ` - && tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" ` - && del dotnet.zip - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;%ProgramFiles%\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/runtime/nanoserver-1903/amd64/Dockerfile b/2.2/runtime/nanoserver-1903/amd64/Dockerfile deleted file mode 100644 index 3115276ade..0000000000 --- a/2.2/runtime/nanoserver-1903/amd64/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1903 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core Runtime -ENV DOTNET_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = '5864a40f662388761bc108510df9540b0b6672ae0f5a04cac71112ef0d1aa5781ffa3c856e919eed68eba6161f21a38c52f0e8850e8ecdf22609c42d2387d848'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1903 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/runtime/nanoserver-1909/amd64/Dockerfile b/2.2/runtime/nanoserver-1909/amd64/Dockerfile deleted file mode 100644 index 3675c20113..0000000000 --- a/2.2/runtime/nanoserver-1909/amd64/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1909 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core Runtime -ENV DOTNET_VERSION 2.2.8 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Runtime/$Env:DOTNET_VERSION/dotnet-runtime-$Env:DOTNET_VERSION-win-x64.zip; ` - $dotnet_sha512 = '5864a40f662388761bc108510df9540b0b6672ae0f5a04cac71112ef0d1aa5781ffa3c856e919eed68eba6161f21a38c52f0e8850e8ecdf22609c42d2387d848'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# Runtime image -FROM mcr.microsoft.com/windows/nanoserver:1909 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true diff --git a/2.2/runtime/stretch-slim/amd64/Dockerfile b/2.2/runtime/stretch-slim/amd64/Dockerfile deleted file mode 100644 index 73b4f5743b..0000000000 --- a/2.2/runtime/stretch-slim/amd64/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-stretch-slim - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='b818557b0090ec047be0fb2e5ffee212e23e8417e1b0164f455e3a880bf5b94967dc4c86d6ed82397af9acc1f7415674904f6225a1abff85d28d2a6d5de8073b' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/runtime/stretch-slim/arm32v7/Dockerfile b/2.2/runtime/stretch-slim/arm32v7/Dockerfile deleted file mode 100644 index f70f8e7fbb..0000000000 --- a/2.2/runtime/stretch-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-stretch-slim-arm32v7 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core -ENV DOTNET_VERSION 2.2.8 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='a3fb720504821eca64ec507e4ae2e321b3119c90f7b14844db85026d386047e1cfdf6f24b07f5fae6f19af9ed7ccbe49e46a39ad16d0c3838d9e9589bf2d5ef9' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/2.2/sdk/alpine3.10/amd64/Dockerfile b/2.2/sdk/alpine3.10/amd64/Dockerfile deleted file mode 100644 index adfcb1efad..0000000000 --- a/2.2/sdk/alpine3.10/amd64/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.10 - -# Disable the invariant mode (set in base image) -RUN apk add --no-cache icu-libs - -ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ - LC_ALL=en_US.UTF-8 \ - LANG=en_US.UTF-8 - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='231118ba205b5d609263fc790851c65900aabf5830d492425849de89b7103f02012a302ce21960cb062426c5b8fd480e1316176a927bd287b08b7d19445f7224' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - && rm dotnet.tar.gz - -# Enable correct mode for dotnet watch (only mode supported in a container) -ENV DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/alpine3.9/amd64/Dockerfile b/2.2/sdk/alpine3.9/amd64/Dockerfile deleted file mode 100644 index 6f0332a00d..0000000000 --- a/2.2/sdk/alpine3.9/amd64/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps -FROM $REPO:2.2-alpine3.9 - -# Disable the invariant mode (set in base image) -RUN apk add --no-cache icu-libs - -ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ - LC_ALL=en_US.UTF-8 \ - LANG=en_US.UTF-8 - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \ - && dotnet_sha512='231118ba205b5d609263fc790851c65900aabf5830d492425849de89b7103f02012a302ce21960cb062426c5b8fd480e1316176a927bd287b08b7d19445f7224' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -C /usr/share/dotnet -xzf dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - && rm dotnet.tar.gz - -# Enable correct mode for dotnet watch (only mode supported in a container) -ENV DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/bionic/amd64/Dockerfile b/2.2/sdk/bionic/amd64/Dockerfile deleted file mode 100644 index a5e81651ae..0000000000 --- a/2.2/sdk/bionic/amd64/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM buildpack-deps:bionic-scm - -# Install .NET CLI dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu60 \ - liblttng-ust0 \ - libssl1.0.0 \ - libstdc++6 \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='9d70b4a8a63b66da90544087199a0f681d135bf90d43ca53b12ea97cc600a768b0a3d2f824cfe27bd3228e058b060c63319cd86033be8b8d27925283f99de958' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 \ - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/bionic/arm32v7/Dockerfile b/2.2/sdk/bionic/arm32v7/Dockerfile deleted file mode 100644 index ec5ec3e6a7..0000000000 --- a/2.2/sdk/bionic/arm32v7/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM arm32v7/buildpack-deps:bionic-scm - -# Install .NET CLI dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu60 \ - liblttng-ust0 \ - libssl1.0.0 \ - libstdc++6 \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='a922b87fc1e433d489d6863fa3faca5a5eeb33f68104c5c4733ca8fbd187230715f6ce384ddbdaca501b1f42c87f590a9299b525be405214803bb1da3c4bbd1c' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - # Add NuGet cache (ARM SDK doesn't include it) - && curl -SL --output /usr/share/dotnet/sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma \ - && lzma_sha512='09c0d7da8da38ed486f53c052f7dd87bfb3f3b9e32300b69b424566395b32422cecbb27db37560d604a89f6463879b40ef6fa5d1ea8fe48cf832aa6f4fa0f331' \ - && echo "$lzma_sha512 /usr/share/dotnet/sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma" | sha512sum -c - - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 \ - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/nanoserver-1809/amd64/Dockerfile b/2.2/sdk/nanoserver-1809/amd64/Dockerfile deleted file mode 100644 index 62e080b289..0000000000 --- a/2.2/sdk/nanoserver-1809/amd64/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1809 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '726f60e2cf82b7fbea97066dda318d468774bcd830c7244aac16610f4a2bbd879cfb89a93dd7983a8b424babe8201d62845e2b904ed698455f1082655dd00286'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# SDK image -FROM mcr.microsoft.com/windows/nanoserver:1809 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true ` - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true ` - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/nanoserver-1809/arm32v7/Dockerfile b/2.2/sdk/nanoserver-1809/arm32v7/Dockerfile deleted file mode 100644 index 5044c4e006..0000000000 --- a/2.2/sdk/nanoserver-1809/arm32v7/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# escape=` - -FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7 - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN curl -SL --output dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_SDK_VERSION%/dotnet-sdk-%DOTNET_SDK_VERSION%-win-arm.zip ` - && mkdir "%ProgramFiles%\dotnet" ` - && tar -zxf dotnet.zip -C "%ProgramFiles%\dotnet" ` - && del dotnet.zip - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;%ProgramFiles%\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true ` - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true ` - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/nanoserver-1903/amd64/Dockerfile b/2.2/sdk/nanoserver-1903/amd64/Dockerfile deleted file mode 100644 index 652e64ba0e..0000000000 --- a/2.2/sdk/nanoserver-1903/amd64/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1903 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '726f60e2cf82b7fbea97066dda318d468774bcd830c7244aac16610f4a2bbd879cfb89a93dd7983a8b424babe8201d62845e2b904ed698455f1082655dd00286'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# SDK image -FROM mcr.microsoft.com/windows/nanoserver:1903 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true ` - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true ` - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/nanoserver-1909/amd64/Dockerfile b/2.2/sdk/nanoserver-1909/amd64/Dockerfile deleted file mode 100644 index 84e15d3f02..0000000000 --- a/2.2/sdk/nanoserver-1909/amd64/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# escape=` - -# Installer image -FROM mcr.microsoft.com/windows/servercore:1909 AS installer - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# Retrieve .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet/Sdk/$Env:DOTNET_SDK_VERSION/dotnet-sdk-$Env:DOTNET_SDK_VERSION-win-x64.zip; ` - $dotnet_sha512 = '726f60e2cf82b7fbea97066dda318d468774bcd830c7244aac16610f4a2bbd879cfb89a93dd7983a8b424babe8201d62845e2b904ed698455f1082655dd00286'; ` - if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $dotnet_sha512) { ` - Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` - exit 1; ` - }; ` - ` - Expand-Archive dotnet.zip -DestinationPath dotnet; ` - Remove-Item -Force dotnet.zip - - -# SDK image -FROM mcr.microsoft.com/windows/nanoserver:1909 - -COPY --from=installer ["/dotnet", "/Program Files/dotnet"] - -# In order to set system PATH, ContainerAdministrator must be used -USER ContainerAdministrator -RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" -USER ContainerUser - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 ` - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true ` - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true ` - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/stretch/amd64/Dockerfile b/2.2/sdk/stretch/amd64/Dockerfile deleted file mode 100644 index ea271f6340..0000000000 --- a/2.2/sdk/stretch/amd64/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM buildpack-deps:stretch-scm - -# Install .NET CLI dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu57 \ - liblttng-ust0 \ - libssl1.0.2 \ - libstdc++6 \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='9d70b4a8a63b66da90544087199a0f681d135bf90d43ca53b12ea97cc600a768b0a3d2f824cfe27bd3228e058b060c63319cd86033be8b8d27925283f99de958' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 \ - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/2.2/sdk/stretch/arm32v7/Dockerfile b/2.2/sdk/stretch/arm32v7/Dockerfile deleted file mode 100644 index 8b68a599c3..0000000000 --- a/2.2/sdk/stretch/arm32v7/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM arm32v7/buildpack-deps:stretch-scm - -# Install .NET CLI dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu57 \ - liblttng-ust0 \ - libssl1.0.2 \ - libstdc++6 \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Install .NET Core SDK -ENV DOTNET_SDK_VERSION 2.2.207 - -RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm.tar.gz \ - && dotnet_sha512='a922b87fc1e433d489d6863fa3faca5a5eeb33f68104c5c4733ca8fbd187230715f6ce384ddbdaca501b1f42c87f590a9299b525be405214803bb1da3c4bbd1c' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /usr/share/dotnet \ - && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \ - && rm dotnet.tar.gz \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ - # Add NuGet cache (ARM SDK doesn't include it) - && curl -SL --output /usr/share/dotnet/sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma \ - && lzma_sha512='09c0d7da8da38ed486f53c052f7dd87bfb3f3b9e32300b69b424566395b32422cecbb27db37560d604a89f6463879b40ef6fa5d1ea8fe48cf832aa6f4fa0f331' \ - && echo "$lzma_sha512 /usr/share/dotnet/sdk/$DOTNET_SDK_VERSION/nuGetPackagesArchive.lzma" | sha512sum -c - - -# Configure web servers to bind to port 80 when present -ENV ASPNETCORE_URLS=http://+:80 \ - # Enable detection of running in a container - DOTNET_RUNNING_IN_CONTAINER=true \ - # Enable correct mode for dotnet watch (only mode supported in a container) - DOTNET_USE_POLLING_FILE_WATCHER=true \ - # Skip extraction of XML docs - generally not useful within an image/container - helps performance - NUGET_XMLDOC_MODE=skip - -# Trigger first run experience by running arbitrary cmd to populate local package cache -RUN dotnet help diff --git a/README.aspnet.md b/README.aspnet.md index abfe5e920f..05fd980975 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -56,10 +56,6 @@ Tags | Dockerfile | OS Version 3.0.1-alpine3.9, 3.0-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.9/amd64/Dockerfile) | Alpine 3.9 3.0.1-disco, 3.0-disco | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/disco/amd64/Dockerfile) | Ubuntu 19.04 3.0.1-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim, 2.2-stretch-slim, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/stretch-slim/amd64/Dockerfile) | Debian 9 -2.2.8-alpine3.10, 2.2-alpine3.10, 2.2.8-alpine, 2.2-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 -2.2.8-alpine3.9, 2.2-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/alpine3.9/amd64/Dockerfile) | Alpine 3.9 -2.2.8-bionic, 2.2-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim, 2.1-stretch-slim, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/amd64/Dockerfile) | Debian 9 2.1.14-alpine3.10, 2.1-alpine3.10, 2.1.14-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.14-alpine3.9, 2.1-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.9/amd64/Dockerfile) | Alpine 3.9 @@ -85,8 +81,6 @@ Tags | Dockerfile | OS Version 3.0.1-buster-slim-arm32v7, 3.0-buster-slim-arm32v7, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/buster-slim/arm32v7/Dockerfile) | Debian 10 3.0.1-disco-arm32v7, 3.0-disco-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/disco/arm32v7/Dockerfile) | Ubuntu 19.04 3.0.1-bionic-arm32v7, 3.0-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim-arm32v7, 2.2-stretch-slim-arm32v7, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/stretch-slim/arm32v7/Dockerfile) | Debian 9 -2.2.8-bionic-arm32v7, 2.2-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.14-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 @@ -95,7 +89,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1909, 3.1-nanoserver-1909, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1909/amd64/Dockerfile) 3.0.1-nanoserver-1909, 3.0-nanoserver-1909, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/nanoserver-1909/amd64/Dockerfile) -2.2.8-nanoserver-1909, 2.2-nanoserver-1909, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-1909/amd64/Dockerfile) 2.1.14-nanoserver-1909, 2.1-nanoserver-1909, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1909/amd64/Dockerfile) ## Windows Server, version 1903 amd64 Tags @@ -103,7 +96,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1903, 3.1-nanoserver-1903, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1903/amd64/Dockerfile) 3.0.1-nanoserver-1903, 3.0-nanoserver-1903, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/nanoserver-1903/amd64/Dockerfile) -2.2.8-nanoserver-1903, 2.2-nanoserver-1903, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-1903/amd64/Dockerfile) 2.1.14-nanoserver-1903, 2.1-nanoserver-1903, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1903/amd64/Dockerfile) ## Windows Server 2019 amd64 Tags @@ -111,7 +103,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1809, 3.1-nanoserver-1809, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1809/amd64/Dockerfile) 3.0.1-nanoserver-1809, 3.0-nanoserver-1809, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/nanoserver-1809/amd64/Dockerfile) -2.2.8-nanoserver-1809, 2.2-nanoserver-1809, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-1809/amd64/Dockerfile) 2.1.14-nanoserver-1809, 2.1-nanoserver-1809, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1809/amd64/Dockerfile) ## Windows Server 2019 arm32 Tags @@ -119,7 +110,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1809/arm32v7/Dockerfile) 3.0.1-nanoserver-1809-arm32v7, 3.0-nanoserver-1809-arm32v7, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/nanoserver-1809/arm32v7/Dockerfile) -2.2.8-nanoserver-1809-arm32v7, 2.2-nanoserver-1809-arm32v7, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/aspnet/nanoserver-1809/arm32v7/Dockerfile) You can retrieve a list of all available tags for dotnet/core/aspnet at https://mcr.microsoft.com/v2/dotnet/core/aspnet/tags/list. diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 5882aa23d3..283e817628 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -44,10 +44,6 @@ Tags | Dockerfile | OS Version 3.0.1-alpine3.9, 3.0-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.9/amd64/Dockerfile) | Alpine 3.9 3.0.1-disco, 3.0-disco | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/disco/amd64/Dockerfile) | Ubuntu 19.04 3.0.1-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim, 2.2-stretch-slim, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/amd64/Dockerfile) | Debian 9 -2.2.8-alpine3.10, 2.2-alpine3.10, 2.2.8-alpine, 2.2-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 -2.2.8-alpine3.9, 2.2-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.9/amd64/Dockerfile) | Alpine 3.9 -2.2.8-bionic, 2.2-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim, 2.1-stretch-slim, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/amd64/Dockerfile) | Debian 9 2.1.14-alpine3.10, 2.1-alpine3.10, 2.1.14-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.14-alpine3.9, 2.1-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.9/amd64/Dockerfile) | Alpine 3.9 @@ -73,8 +69,6 @@ Tags | Dockerfile | OS Version 3.0.1-buster-slim-arm32v7, 3.0-buster-slim-arm32v7, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/buster-slim/arm32v7/Dockerfile) | Debian 10 3.0.1-disco-arm32v7, 3.0-disco-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/disco/arm32v7/Dockerfile) | Ubuntu 19.04 3.0.1-bionic-arm32v7, 3.0-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim-arm32v7, 2.2-stretch-slim-arm32v7, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/arm32v7/Dockerfile) | Debian 9 -2.2.8-bionic-arm32v7, 2.2-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.14-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 diff --git a/README.runtime.md b/README.runtime.md index dc175d2e5b..5efcb066c3 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -52,10 +52,6 @@ Tags | Dockerfile | OS Version 3.0.1-alpine3.9, 3.0-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.9/amd64/Dockerfile) | Alpine 3.9 3.0.1-disco, 3.0-disco | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/disco/amd64/Dockerfile) | Ubuntu 19.04 3.0.1-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim, 2.2-stretch-slim, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/stretch-slim/amd64/Dockerfile) | Debian 9 -2.2.8-alpine3.10, 2.2-alpine3.10, 2.2.8-alpine, 2.2-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 -2.2.8-alpine3.9, 2.2-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/alpine3.9/amd64/Dockerfile) | Alpine 3.9 -2.2.8-bionic, 2.2-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim, 2.1-stretch-slim, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/amd64/Dockerfile) | Debian 9 2.1.14-alpine3.10, 2.1-alpine3.10, 2.1.14-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.14-alpine3.9, 2.1-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.9/amd64/Dockerfile) | Alpine 3.9 @@ -81,8 +77,6 @@ Tags | Dockerfile | OS Version 3.0.1-buster-slim-arm32v7, 3.0-buster-slim-arm32v7, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/buster-slim/arm32v7/Dockerfile) | Debian 10 3.0.1-disco-arm32v7, 3.0-disco-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/disco/arm32v7/Dockerfile) | Ubuntu 19.04 3.0.1-bionic-arm32v7, 3.0-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -2.2.8-stretch-slim-arm32v7, 2.2-stretch-slim-arm32v7, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/stretch-slim/arm32v7/Dockerfile) | Debian 9 -2.2.8-bionic-arm32v7, 2.2-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 2.1.14-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.14-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 @@ -91,7 +85,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1909, 3.1-nanoserver-1909, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1909/amd64/Dockerfile) 3.0.1-nanoserver-1909, 3.0-nanoserver-1909, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/nanoserver-1909/amd64/Dockerfile) -2.2.8-nanoserver-1909, 2.2-nanoserver-1909, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1909/amd64/Dockerfile) 2.1.14-nanoserver-1909, 2.1-nanoserver-1909, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1909/amd64/Dockerfile) ## Windows Server, version 1903 amd64 Tags @@ -99,7 +92,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1903, 3.1-nanoserver-1903, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1903/amd64/Dockerfile) 3.0.1-nanoserver-1903, 3.0-nanoserver-1903, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/nanoserver-1903/amd64/Dockerfile) -2.2.8-nanoserver-1903, 2.2-nanoserver-1903, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1903/amd64/Dockerfile) 2.1.14-nanoserver-1903, 2.1-nanoserver-1903, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1903/amd64/Dockerfile) ## Windows Server 2019 amd64 Tags @@ -107,7 +99,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1809, 3.1-nanoserver-1809, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1809/amd64/Dockerfile) 3.0.1-nanoserver-1809, 3.0-nanoserver-1809, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/nanoserver-1809/amd64/Dockerfile) -2.2.8-nanoserver-1809, 2.2-nanoserver-1809, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1809/amd64/Dockerfile) 2.1.14-nanoserver-1809, 2.1-nanoserver-1809, 2.1.14, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile) ## Windows Server 2019 arm32 Tags @@ -115,7 +106,6 @@ Tag | Dockerfile ---------| --------------- 3.1.0-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.0, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1809/arm32v7/Dockerfile) 3.0.1-nanoserver-1809-arm32v7, 3.0-nanoserver-1809-arm32v7, 3.0.1, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/nanoserver-1809/arm32v7/Dockerfile) -2.2.8-nanoserver-1809-arm32v7, 2.2-nanoserver-1809-arm32v7, 2.2.8, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/runtime/nanoserver-1809/arm32v7/Dockerfile) You can retrieve a list of all available tags for dotnet/core/runtime at https://mcr.microsoft.com/v2/dotnet/core/runtime/tags/list. diff --git a/README.sdk.md b/README.sdk.md index 06cbfa66e2..66fd06119c 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -56,10 +56,6 @@ Tags | Dockerfile | OS Version 3.0.101-alpine3.9, 3.0-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/alpine3.9/amd64/Dockerfile) | Alpine 3.9 3.0.101-disco, 3.0-disco | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/disco/amd64/Dockerfile) | Ubuntu 19.04 3.0.101-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 -2.2.207-stretch, 2.2-stretch, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/stretch/amd64/Dockerfile) | Debian 9 -2.2.207-alpine3.10, 2.2-alpine3.10, 2.2.207-alpine, 2.2-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 -2.2.207-alpine3.9, 2.2-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/alpine3.9/amd64/Dockerfile) | Alpine 3.9 -2.2.207-bionic, 2.2-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.607-stretch, 2.1-stretch, 2.1.607, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/amd64/Dockerfile) | Debian 9 2.1.607-alpine3.10, 2.1-alpine3.10, 2.1.607-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.607-alpine3.9, 2.1-alpine3.9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.9/amd64/Dockerfile) | Alpine 3.9 @@ -82,8 +78,6 @@ Tags | Dockerfile | OS Version 3.0.101-buster-arm32v7, 3.0-buster-arm32v7, 3.0.101, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/buster/arm32v7/Dockerfile) | Debian 10 3.0.101-disco-arm32v7, 3.0-disco-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/disco/arm32v7/Dockerfile) | Ubuntu 19.04 3.0.101-bionic-arm32v7, 3.0-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -2.2.207-stretch-arm32v7, 2.2-stretch-arm32v7, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/stretch/arm32v7/Dockerfile) | Debian 9 -2.2.207-bionic-arm32v7, 2.2-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 2.1.607-stretch-arm32v7, 2.1-stretch-arm32v7, 2.1.607, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/arm32v7/Dockerfile) | Debian 9 2.1.607-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 @@ -92,7 +86,6 @@ Tag | Dockerfile ---------| --------------- 3.1.100-nanoserver-1909, 3.1-nanoserver-1909, 3.1.100, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1909/amd64/Dockerfile) 3.0.101-nanoserver-1909, 3.0-nanoserver-1909, 3.0.101, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/nanoserver-1909/amd64/Dockerfile) -2.2.207-nanoserver-1909, 2.2-nanoserver-1909, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/nanoserver-1909/amd64/Dockerfile) 2.1.607-nanoserver-1909, 2.1-nanoserver-1909, 2.1.607, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1909/amd64/Dockerfile) ## Windows Server, version 1903 amd64 Tags @@ -100,7 +93,6 @@ Tag | Dockerfile ---------| --------------- 3.1.100-nanoserver-1903, 3.1-nanoserver-1903, 3.1.100, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1903/amd64/Dockerfile) 3.0.101-nanoserver-1903, 3.0-nanoserver-1903, 3.0.101, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/nanoserver-1903/amd64/Dockerfile) -2.2.207-nanoserver-1903, 2.2-nanoserver-1903, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/nanoserver-1903/amd64/Dockerfile) 2.1.607-nanoserver-1903, 2.1-nanoserver-1903, 2.1.607, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1903/amd64/Dockerfile) ## Windows Server 2019 amd64 Tags @@ -108,7 +100,6 @@ Tag | Dockerfile ---------| --------------- 3.1.100-nanoserver-1809, 3.1-nanoserver-1809, 3.1.100, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1809/amd64/Dockerfile) 3.0.101-nanoserver-1809, 3.0-nanoserver-1809, 3.0.101, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/nanoserver-1809/amd64/Dockerfile) -2.2.207-nanoserver-1809, 2.2-nanoserver-1809, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/nanoserver-1809/amd64/Dockerfile) 2.1.607-nanoserver-1809, 2.1-nanoserver-1809, 2.1.607, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1809/amd64/Dockerfile) ## Windows Server 2019 arm32 Tags @@ -116,7 +107,6 @@ Tag | Dockerfile ---------| --------------- 3.1.100-nanoserver-1809-arm32v7, 3.1-nanoserver-1809-arm32v7, 3.1.100, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1809/arm32v7/Dockerfile) 3.0.101-nanoserver-1809-arm32v7, 3.0-nanoserver-1809-arm32v7, 3.0.101, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/nanoserver-1809/arm32v7/Dockerfile) -2.2.207-nanoserver-1809-arm32v7, 2.2-nanoserver-1809-arm32v7, 2.2.207, 2.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.2/sdk/nanoserver-1809/arm32v7/Dockerfile) You can retrieve a list of all available tags for dotnet/core/sdk at https://mcr.microsoft.com/v2/dotnet/core/sdk/tags/list. diff --git a/eng/common/templates/jobs/build-images.yml b/eng/common/templates/jobs/build-images.yml index 4d0dd29a1f..d4772233a2 100644 --- a/eng/common/templates/jobs/build-images.yml +++ b/eng/common/templates/jobs/build-images.yml @@ -23,26 +23,6 @@ jobs: imageBuilderBuildArgs: $(imageBuilder.queueArgs) imageBuilderDockerRunExtraOptions: $(build.imageBuilderDockerRunExtraOptions) steps: - # This script is necessary to workaround there not being a matching architecture when pulling images - # on an aarch64 machine. By using the multi-arch tag for the images referenced in the sample - # Dockerfiles, the Docker CLI attempts to find a matching arch and can't find one. The workaround is - # to manually update the Dockerfiles to refer to the architecture-specific images. The long-term - # solution is to use the --platform option in Docker CLI when generally available. - # See https://github.com/moby/moby/pull/37350 - - script: > - job="$(Agent.JobName)" && - sampleFolder=$(echo "$job" | grep -o -E "aspnetapp|dotnetapp") && - dockerfilePath="samples/$sampleFolder/Dockerfile" && - sed 's/:2.2 AS build/:2.2-stretch-arm32v7 AS build/g' $dockerfilePath > Dockerfile.tmp && - mv Dockerfile.tmp $dockerfilePath && - sed 's/:2.2 AS runtime/:2.2-stretch-slim-arm32v7 AS runtime/g' $dockerfilePath > Dockerfile.tmp && - mv Dockerfile.tmp $dockerfilePath - displayName: Update Sample Dockerfile - condition: " - and( - succeeded(), - contains(variables['manifest'], 'samples'), - eq('${{ parameters.name }}', 'Build_Linux_arm32v7'))" - template: ${{ format('../steps/init-docker-{0}.yml', parameters.dockerClientOS) }} parameters: setupRemoteDockerServer: ${{ parameters.useRemoteDockerServer }} diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 4a3109ed5a..4b7bf9bd89 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -7,10 +7,6 @@ $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-alpine3.9) $(McrTagsYmlTagGroup:3.0-disco) $(McrTagsYmlTagGroup:3.0-bionic) -$(McrTagsYmlTagGroup:2.2-stretch-slim) -$(McrTagsYmlTagGroup:2.2-alpine3.10) -$(McrTagsYmlTagGroup:2.2-alpine3.9) -$(McrTagsYmlTagGroup:2.2-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-alpine3.9) @@ -28,22 +24,16 @@ $(McrTagsYmlTagGroup:3.0-bionic-arm64v8) $(McrTagsYmlTagGroup:3.0-buster-slim-arm32v7) $(McrTagsYmlTagGroup:3.0-disco-arm32v7) $(McrTagsYmlTagGroup:3.0-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.2-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.2-bionic-arm32v7) $(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) $(McrTagsYmlTagGroup:2.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.0-nanoserver-1909) -$(McrTagsYmlTagGroup:2.2-nanoserver-1909) $(McrTagsYmlTagGroup:2.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.0-nanoserver-1903) -$(McrTagsYmlTagGroup:2.2-nanoserver-1903) $(McrTagsYmlTagGroup:2.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.0-nanoserver-1809) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809) $(McrTagsYmlTagGroup:2.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7) $(McrTagsYmlTagGroup:3.0-nanoserver-1809-arm32v7) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index 2692230bd4..d75a02349c 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -7,10 +7,6 @@ $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-alpine3.9) $(McrTagsYmlTagGroup:3.0-disco) $(McrTagsYmlTagGroup:3.0-bionic) -$(McrTagsYmlTagGroup:2.2-stretch-slim) -$(McrTagsYmlTagGroup:2.2-alpine3.10) -$(McrTagsYmlTagGroup:2.2-alpine3.9) -$(McrTagsYmlTagGroup:2.2-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-alpine3.9) @@ -28,7 +24,5 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.0-buster-slim-arm32v7) $(McrTagsYmlTagGroup:3.0-disco-arm32v7) $(McrTagsYmlTagGroup:3.0-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.2-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.2-bionic-arm32v7) $(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) $(McrTagsYmlTagGroup:2.1-bionic-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 0b210661ae..4027decaa1 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -7,10 +7,6 @@ $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-alpine3.9) $(McrTagsYmlTagGroup:3.0-disco) $(McrTagsYmlTagGroup:3.0-bionic) -$(McrTagsYmlTagGroup:2.2-stretch-slim) -$(McrTagsYmlTagGroup:2.2-alpine3.10) -$(McrTagsYmlTagGroup:2.2-alpine3.9) -$(McrTagsYmlTagGroup:2.2-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-alpine3.9) @@ -28,22 +24,16 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.0-buster-slim-arm32v7) $(McrTagsYmlTagGroup:3.0-disco-arm32v7) $(McrTagsYmlTagGroup:3.0-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.2-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.2-bionic-arm32v7) $(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) $(McrTagsYmlTagGroup:2.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.0-nanoserver-1909) -$(McrTagsYmlTagGroup:2.2-nanoserver-1909) $(McrTagsYmlTagGroup:2.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.0-nanoserver-1903) -$(McrTagsYmlTagGroup:2.2-nanoserver-1903) $(McrTagsYmlTagGroup:2.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.0-nanoserver-1809) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809) $(McrTagsYmlTagGroup:2.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7) $(McrTagsYmlTagGroup:3.0-nanoserver-1809-arm32v7) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index 413b48f6cf..24180aad23 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -7,10 +7,6 @@ $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-alpine3.9) $(McrTagsYmlTagGroup:3.0-disco) $(McrTagsYmlTagGroup:3.0-bionic) -$(McrTagsYmlTagGroup:2.2-stretch) -$(McrTagsYmlTagGroup:2.2-alpine3.10) -$(McrTagsYmlTagGroup:2.2-alpine3.9) -$(McrTagsYmlTagGroup:2.2-bionic) $(McrTagsYmlTagGroup:2.1-stretch) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-alpine3.9) @@ -25,22 +21,16 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.0-buster-arm32v7) $(McrTagsYmlTagGroup:3.0-disco-arm32v7) $(McrTagsYmlTagGroup:3.0-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.2-stretch-arm32v7) -$(McrTagsYmlTagGroup:2.2-bionic-arm32v7) $(McrTagsYmlTagGroup:2.1-stretch-arm32v7) $(McrTagsYmlTagGroup:2.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.0-nanoserver-1909) -$(McrTagsYmlTagGroup:2.2-nanoserver-1909) $(McrTagsYmlTagGroup:2.1-nanoserver-1909) $(McrTagsYmlTagGroup:3.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.0-nanoserver-1903) -$(McrTagsYmlTagGroup:2.2-nanoserver-1903) $(McrTagsYmlTagGroup:2.1-nanoserver-1903) $(McrTagsYmlTagGroup:3.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.0-nanoserver-1809) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809) $(McrTagsYmlTagGroup:2.1-nanoserver-1809) $(McrTagsYmlTagGroup:3.1-nanoserver-1809-arm32v7) $(McrTagsYmlTagGroup:3.0-nanoserver-1809-arm32v7) -$(McrTagsYmlTagGroup:2.2-nanoserver-1809-arm32v7) diff --git a/manifest.json b/manifest.json index 9d61e99eb8..5c7f9179c9 100644 --- a/manifest.json +++ b/manifest.json @@ -4,8 +4,6 @@ "variables": { "2.1-RuntimeVersion": "2.1.14", "2.1-SdkVersion": "2.1.607", - "2.2-RuntimeVersion": "2.2.8", - "2.2-SdkVersion": "2.2.207", "3.0-RuntimeVersion": "3.0.1", "3.0-SdkVersion": "3.0.101", "3.1-RuntimeVersion": "3.1.0", @@ -25,12 +23,6 @@ }, "2.1": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)": { - "documentationGroup": "2.2" - }, - "2.2": { - "documentationGroup": "2.2" } }, "platforms": [ @@ -44,12 +36,6 @@ }, "2.1-stretch-slim": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-stretch-slim": { - "documentationGroup": "2.2" - }, - "2.2-stretch-slim": { - "documentationGroup": "2.2" } } }, @@ -64,12 +50,6 @@ }, "2.1-stretch-slim-arm32v7": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-stretch-slim-arm32v7": { - "documentationGroup": "2.2" - }, - "2.2-stretch-slim-arm32v7": { - "documentationGroup": "2.2" } }, "variant": "v7" @@ -88,12 +68,6 @@ }, "2.1-alpine3.9": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-alpine3.9": { - "documentationGroup": "2.2" - }, - "2.2-alpine3.9": { - "documentationGroup": "2.2" } } } @@ -117,18 +91,6 @@ }, "2.1-alpine": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-alpine3.10": { - "documentationGroup": "2.2" - }, - "2.2-alpine3.10": { - "documentationGroup": "2.2" - }, - "$(2.2-RuntimeVersion)-alpine": { - "documentationGroup": "2.2" - }, - "2.2-alpine": { - "documentationGroup": "2.2" } } } @@ -146,12 +108,6 @@ }, "2.1-bionic": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-bionic": { - "documentationGroup": "2.2" - }, - "2.2-bionic": { - "documentationGroup": "2.2" } } } @@ -170,12 +126,6 @@ }, "2.1-bionic-arm32v7": { "documentationGroup": "2.1" - }, - "$(2.2-RuntimeVersion)-bionic-arm32v7": { - "documentationGroup": "2.2" - }, - "2.2-bionic-arm32v7": { - "documentationGroup": "2.2" } }, "variant": "v7" @@ -617,148 +567,6 @@ } ] }, - { - "sharedTags": { - "$(2.2-RuntimeVersion)": {}, - "2.2": {} - }, - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/stretch-slim/amd64", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-RuntimeVersion)-stretch-slim": {}, - "2.2-stretch-slim": {} - } - }, - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/stretch-slim/arm32v7", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-RuntimeVersion)-stretch-slim-arm32v7": {}, - "2.2-stretch-slim-arm32v7": {} - }, - "variant": "v7" - }, - { - "dockerfile": "2.2/runtime/nanoserver-1809/amd64", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1809": {}, - "2.2-nanoserver-1809": {} - } - }, - { - "architecture": "arm", - "dockerfile": "2.2/runtime/nanoserver-1809/arm32v7", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32": { - "isUndocumented": true - } - } - }, - { - "dockerfile": "2.2/runtime/nanoserver-1903/amd64", - "os": "windows", - "osVersion": "nanoserver-1903", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1903": {}, - "2.2-nanoserver-1903": {} - } - }, - { - "dockerfile": "2.2/runtime/nanoserver-1909/amd64", - "os": "windows", - "osVersion": "nanoserver-1909", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1909": {}, - "2.2-nanoserver-1909": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/alpine3.9/amd64", - "os": "linux", - "osVersion": "alpine3.9", - "tags": { - "$(2.2-RuntimeVersion)-alpine3.9": {}, - "2.2-alpine3.9": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/alpine3.10/amd64", - "os": "linux", - "osVersion": "alpine3.10", - "tags": { - "$(2.2-RuntimeVersion)-alpine3.10": {}, - "2.2-alpine3.10": {}, - "$(2.2-RuntimeVersion)-alpine": {}, - "2.2-alpine": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/bionic/amd64", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-RuntimeVersion)-bionic": {}, - "2.2-bionic": {} - } - } - ] - }, - { - "platforms": [ - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/runtime/bionic/arm32v7", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-RuntimeVersion)-bionic-arm32v7": {}, - "2.2-bionic-arm32v7": {} - }, - "variant": "v7" - } - ] - }, { "sharedTags": { "$(3.0-RuntimeVersion)": {}, @@ -1357,148 +1165,6 @@ } ] }, - { - "sharedTags": { - "$(2.2-RuntimeVersion)": {}, - "2.2": {} - }, - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/stretch-slim/amd64", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-RuntimeVersion)-stretch-slim": {}, - "2.2-stretch-slim": {} - } - }, - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/stretch-slim/arm32v7", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-RuntimeVersion)-stretch-slim-arm32v7": {}, - "2.2-stretch-slim-arm32v7": {} - }, - "variant": "v7" - }, - { - "dockerfile": "2.2/aspnet/nanoserver-1809/amd64", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1809": {}, - "2.2-nanoserver-1809": {} - } - }, - { - "architecture": "arm", - "dockerfile": "2.2/aspnet/nanoserver-1809/arm32v7", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32": { - "isUndocumented": true - } - } - }, - { - "dockerfile": "2.2/aspnet/nanoserver-1903/amd64", - "os": "windows", - "osVersion": "nanoserver-1903", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1903": {}, - "2.2-nanoserver-1903": {} - } - }, - { - "dockerfile": "2.2/aspnet/nanoserver-1909/amd64", - "os": "windows", - "osVersion": "nanoserver-1909", - "tags": { - "$(2.2-RuntimeVersion)-nanoserver-1909": {}, - "2.2-nanoserver-1909": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/alpine3.9/amd64", - "os": "linux", - "osVersion": "alpine3.9", - "tags": { - "$(2.2-RuntimeVersion)-alpine3.9": {}, - "2.2-alpine3.9": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/alpine3.10/amd64", - "os": "linux", - "osVersion": "alpine3.10", - "tags": { - "$(2.2-RuntimeVersion)-alpine3.10": {}, - "2.2-alpine3.10": {}, - "$(2.2-RuntimeVersion)-alpine": {}, - "2.2-alpine": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/bionic/amd64", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-RuntimeVersion)-bionic": {}, - "2.2-bionic": {} - } - } - ] - }, - { - "platforms": [ - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/aspnet/bionic/arm32v7", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-RuntimeVersion)-bionic-arm32v7": {}, - "2.2-bionic-arm32v7": {} - }, - "variant": "v7" - } - ] - }, { "sharedTags": { "$(3.0-RuntimeVersion)": {}, @@ -2109,136 +1775,6 @@ } ] }, - { - "sharedTags": { - "$(2.2-SdkVersion)": {}, - "2.2": {} - }, - "platforms": [ - { - "dockerfile": "2.2/sdk/stretch/amd64", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-SdkVersion)-stretch": {}, - "2.2-stretch": {} - } - }, - { - "architecture": "arm", - "dockerfile": "2.2/sdk/stretch/arm32v7", - "os": "linux", - "osVersion": "stretch", - "tags": { - "$(2.2-SdkVersion)-stretch-arm32v7": {}, - "2.2-stretch-arm32v7": {} - }, - "variant": "v7" - }, - { - "dockerfile": "2.2/sdk/nanoserver-1809/amd64", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-SdkVersion)-nanoserver-1809": {}, - "2.2-nanoserver-1809": {} - } - }, - { - "architecture": "arm", - "dockerfile": "2.2/sdk/nanoserver-1809/arm32v7", - "os": "windows", - "osVersion": "nanoserver-1809", - "tags": { - "$(2.2-SdkVersion)-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32v7": {}, - "2.2-nanoserver-1809-arm32": { - "isUndocumented": true - } - } - }, - { - "dockerfile": "2.2/sdk/nanoserver-1903/amd64", - "os": "windows", - "osVersion": "nanoserver-1903", - "tags": { - "$(2.2-SdkVersion)-nanoserver-1903": {}, - "2.2-nanoserver-1903": {} - } - }, - { - "dockerfile": "2.2/sdk/nanoserver-1909/amd64", - "os": "windows", - "osVersion": "nanoserver-1909", - "tags": { - "$(2.2-SdkVersion)-nanoserver-1909": {}, - "2.2-nanoserver-1909": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/sdk/alpine3.9/amd64", - "os": "linux", - "osVersion": "alpine3.9", - "tags": { - "$(2.2-SdkVersion)-alpine3.9": {}, - "2.2-alpine3.9": {} - } - } - ] - }, - { - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "2.2/sdk/alpine3.10/amd64", - "os": "linux", - "osVersion": "alpine3.10", - "tags": { - "$(2.2-SdkVersion)-alpine3.10": {}, - "2.2-alpine3.10": {}, - "$(2.2-SdkVersion)-alpine": {}, - "2.2-alpine": {} - } - } - ] - }, - { - "platforms": [ - { - "dockerfile": "2.2/sdk/bionic/amd64", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-SdkVersion)-bionic": {}, - "2.2-bionic": {} - } - } - ] - }, - { - "platforms": [ - { - "architecture": "arm", - "dockerfile": "2.2/sdk/bionic/arm32v7", - "os": "linux", - "osVersion": "bionic", - "tags": { - "$(2.2-SdkVersion)-bionic-arm32v7": {}, - "2.2-bionic-arm32v7": {} - }, - "variant": "v7" - } - ] - }, { "sharedTags": { "$(3.0-SdkVersion)": {}, diff --git a/samples/aspnetapp/README.md b/samples/aspnetapp/README.md index db61d3e05b..ff128315c0 100644 --- a/samples/aspnetapp/README.md +++ b/samples/aspnetapp/README.md @@ -82,7 +82,7 @@ After the application starts, navigate to `http://localhost:8000` in your web br ## Build and run the sample for Ubuntu 18.04 with Docker -You can also build for [Ubuntu 18.04](https://hub.docker.com/_/ubuntu/), with a `bionic` tag. The `bionic` tags are documented at [dotnet/core/sdk](https://hub.docker.com/_/microsoft-dotnet-core-sdk/) and [dotnet/core/aspnet](https://hub.docker.com/_/microsoft-dotnet-core-aspnet/). You would switch to use the `2.2-bionic` tag for both the build and runtime phases. +You can also build for [Ubuntu 18.04](https://hub.docker.com/_/ubuntu/), with a `bionic` tag. The `bionic` tags are documented at [dotnet/core/sdk](https://hub.docker.com/_/microsoft-dotnet-core-sdk/) and [dotnet/core/aspnet](https://hub.docker.com/_/microsoft-dotnet-core-aspnet/). You would switch to use the `3.1-bionic` tag for both the build and runtime phases. ## Build and run the sample for Linux ARM32 with Docker @@ -108,7 +108,7 @@ We recommend that you do not use `--rm` in production. It cleans up container re ## Build and run the sample locally -You can build and run the sample locally with the [.NET Core 2.2 SDK](https://www.microsoft.com/net/download/core) using the following commands. The commands assume that you are in the root of the repository. +You can build and run the sample locally with the [.NET Core SDK](https://www.microsoft.com/net/download/core) using the following commands. The commands assume that you are in the root of the repository. ```console cd samples diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs index ab72592590..0507dde833 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs @@ -9,7 +9,6 @@ namespace Microsoft.DotNet.Docker.Tests public static class ImageVersion { public static readonly Version V2_1 = new Version(2, 1); - public static readonly Version V2_2 = new Version(2, 2); public static readonly Version V3_0 = new Version(3, 0); public static readonly Version V3_1 = new Version(3, 1); } diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index dcd5135052..b0d772b020 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -20,12 +20,6 @@ public static class TestData new ProductImageData { Version = V2_1, OS = OS.Alpine310, Arch = Arch.Amd64 }, new ProductImageData { Version = V2_1, OS = OS.StretchSlim, Arch = Arch.Arm }, new ProductImageData { Version = V2_1, OS = OS.Bionic, Arch = Arch.Arm }, - new ProductImageData { Version = V2_2, OS = OS.StretchSlim, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.Bionic, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.Alpine39, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.Alpine310, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.StretchSlim, Arch = Arch.Arm }, - new ProductImageData { Version = V2_2, OS = OS.Bionic, Arch = Arch.Arm }, new ProductImageData { Version = V3_0, OS = OS.BusterSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.Disco, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.Bionic, Arch = Arch.Amd64 }, @@ -53,10 +47,6 @@ public static class TestData new ProductImageData { Version = V2_1, OS = OS.NanoServer1809, Arch = Arch.Amd64 }, new ProductImageData { Version = V2_1, OS = OS.NanoServer1903, Arch = Arch.Amd64 }, new ProductImageData { Version = V2_1, OS = OS.NanoServer1909, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.NanoServer1809, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.NanoServer1809, Arch = Arch.Arm }, - new ProductImageData { Version = V2_2, OS = OS.NanoServer1903, Arch = Arch.Amd64 }, - new ProductImageData { Version = V2_2, OS = OS.NanoServer1909, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.NanoServer1809, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.NanoServer1809, Arch = Arch.Arm }, new ProductImageData { Version = V3_0, OS = OS.NanoServer1903, Arch = Arch.Amd64 },