From c31c7bc752ff7f89cc618d561f2adb4ff3afe4be Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 8 Jan 2020 10:29:54 -0600 Subject: [PATCH] Add Dockerfiles for Alpine 3.11 (#1562) --- 2.1/aspnet/alpine3.11/amd64/Dockerfile | 13 + 2.1/runtime-deps/alpine3.11/amd64/Dockerfile | 22 ++ 2.1/runtime/alpine3.11/amd64/Dockerfile | 13 + 2.1/sdk/alpine3.11/amd64/Dockerfile | 28 ++ 3.0/aspnet/alpine3.11/amd64/Dockerfile | 11 + 3.0/aspnet/alpine3.11/arm64v8/Dockerfile | 11 + 3.0/runtime-deps/alpine3.11/amd64/Dockerfile | 19 + .../alpine3.11/arm64v8/Dockerfile | 19 + 3.0/runtime/alpine3.11/amd64/Dockerfile | 13 + 3.0/runtime/alpine3.11/arm64v8/Dockerfile | 13 + 3.0/sdk/alpine3.11/amd64/Dockerfile | 47 +++ 3.1/aspnet/alpine3.11/amd64/Dockerfile | 10 + 3.1/aspnet/alpine3.11/arm64v8/Dockerfile | 10 + 3.1/runtime/alpine3.11/amd64/Dockerfile | 12 + 3.1/runtime/alpine3.11/arm64v8/Dockerfile | 12 + 3.1/sdk/alpine3.11/amd64/Dockerfile | 47 +++ README.aspnet.md | 15 +- README.runtime-deps.md | 15 +- README.runtime.md | 15 +- README.sdk.md | 9 +- .../aspnet-tags.yml | 5 + .../runtime-deps-tags.yml | 5 + .../runtime-tags.yml | 5 + eng/mcr-tags-metadata-templates/sdk-tags.yml | 3 + manifest.json | 371 ++++++++++++++++-- tests/Microsoft.DotNet.Docker.Tests/OS.cs | 1 + .../Microsoft.DotNet.Docker.Tests/TestData.cs | 9 +- .../performance/ImageSize.nightly.linux.json | 16 + 28 files changed, 720 insertions(+), 49 deletions(-) create mode 100644 2.1/aspnet/alpine3.11/amd64/Dockerfile create mode 100644 2.1/runtime-deps/alpine3.11/amd64/Dockerfile create mode 100644 2.1/runtime/alpine3.11/amd64/Dockerfile create mode 100644 2.1/sdk/alpine3.11/amd64/Dockerfile create mode 100644 3.0/aspnet/alpine3.11/amd64/Dockerfile create mode 100644 3.0/aspnet/alpine3.11/arm64v8/Dockerfile create mode 100644 3.0/runtime-deps/alpine3.11/amd64/Dockerfile create mode 100644 3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile create mode 100644 3.0/runtime/alpine3.11/amd64/Dockerfile create mode 100644 3.0/runtime/alpine3.11/arm64v8/Dockerfile create mode 100644 3.0/sdk/alpine3.11/amd64/Dockerfile create mode 100644 3.1/aspnet/alpine3.11/amd64/Dockerfile create mode 100644 3.1/aspnet/alpine3.11/arm64v8/Dockerfile create mode 100644 3.1/runtime/alpine3.11/amd64/Dockerfile create mode 100644 3.1/runtime/alpine3.11/arm64v8/Dockerfile create mode 100644 3.1/sdk/alpine3.11/amd64/Dockerfile diff --git a/2.1/aspnet/alpine3.11/amd64/Dockerfile b/2.1/aspnet/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..80de22b6a0 --- /dev/null +++ b/2.1/aspnet/alpine3.11/amd64/Dockerfile @@ -0,0 +1,13 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:2.1-alpine3.11 + +# Install ASP.NET Core +ENV ASPNETCORE_VERSION 2.1.14 + +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='d7ead16ac4825c9a0d2f77d8f643e3fa60e3abded17df6b788c3ab825df7821439c7ffc52aeb7c92529dd3d40c2e82bfa0f4e26b4f43228f4977b3db2f292c6b' \ + && 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.1/runtime-deps/alpine3.11/amd64/Dockerfile b/2.1/runtime-deps/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..d99c5f832b --- /dev/null +++ b/2.1/runtime-deps/alpine3.11/amd64/Dockerfile @@ -0,0 +1,22 @@ +FROM alpine:3.11 + +RUN apk add --no-cache \ + ca-certificates \ + \ + # .NET Core dependencies + krb5-libs \ + libgcc \ + libintl \ + libssl1.1 \ + libstdc++ \ + lttng-ust \ + tzdata \ + userspace-rcu \ + zlib + +# 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 \ + # Set the invariant mode since icu_libs isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true diff --git a/2.1/runtime/alpine3.11/amd64/Dockerfile b/2.1/runtime/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..0ea1ea65bc --- /dev/null +++ b/2.1/runtime/alpine3.11/amd64/Dockerfile @@ -0,0 +1,13 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:2.1-alpine3.11 + +# Install .NET Core +ENV DOTNET_VERSION 2.1.14 + +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='ca46796d73bbf24137ccfde60aeabce78218a3559469a7837f5a513e0f0b879d1ed895bd5d89c65fccd1aaa54ddae3f50a0ef03ef636d3cbaa607a8f353a54fb' \ + && 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.1/sdk/alpine3.11/amd64/Dockerfile b/2.1/sdk/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..b5b14b317d --- /dev/null +++ b/2.1/sdk/alpine3.11/amd64/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:2.1-alpine3.11 + +# 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.1.607 + +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='61caf6602b8a2aa89769b3e91ddaec963d8ab9f802cd7f6c6da4f02426358712bc2bb0930e7ee3a81d75c7607039543b554cb8ed50e45610655f9e91ed0f2f17' \ + && 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/3.0/aspnet/alpine3.11/amd64/Dockerfile b/3.0/aspnet/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..1d921c11f6 --- /dev/null +++ b/3.0/aspnet/alpine3.11/amd64/Dockerfile @@ -0,0 +1,11 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime +FROM $REPO:3.0-alpine3.11 + +# Install ASP.NET Core +ENV ASPNETCORE_VERSION 3.0.1 + +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='3945c64b36fd5a8bf9cf4427d0ff17280d929fb6c8b05a37b6f340e025a3936aa9f9aa709b95daf08fa6d33b6def3f04822265c160e81dc6ae46173019232ad8' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz diff --git a/3.0/aspnet/alpine3.11/arm64v8/Dockerfile b/3.0/aspnet/alpine3.11/arm64v8/Dockerfile new file mode 100644 index 0000000000..b1eaa29f4f --- /dev/null +++ b/3.0/aspnet/alpine3.11/arm64v8/Dockerfile @@ -0,0 +1,11 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime +FROM $REPO:3.0-alpine3.11-arm64v8 + +# Install ASP.NET Core +ENV ASPNETCORE_VERSION 3.0.1 + +RUN wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-musl-arm64.tar.gz \ + && aspnetcore_sha512='716103e12b7d7c2b623fcd82a990f3772bede2fb0500fae9fb83de935f43d3b06e612f2dbe0eacde7abee8f49a24454e58e50537ad5d0977abe523f38a8d1e23' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz diff --git a/3.0/runtime-deps/alpine3.11/amd64/Dockerfile b/3.0/runtime-deps/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..d4a8a81e8b --- /dev/null +++ b/3.0/runtime-deps/alpine3.11/amd64/Dockerfile @@ -0,0 +1,19 @@ +FROM alpine:3.11 + +RUN apk add --no-cache \ + ca-certificates \ + \ + # .NET Core dependencies + krb5-libs \ + libgcc \ + libintl \ + libssl1.1 \ + libstdc++ \ + zlib + +# 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 \ + # Set the invariant mode since icu_libs isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true diff --git a/3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile b/3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile new file mode 100644 index 0000000000..3c2bfacd83 --- /dev/null +++ b/3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile @@ -0,0 +1,19 @@ +FROM arm64v8/alpine:3.11 + +RUN apk add --no-cache \ + ca-certificates \ + \ + # .NET Core dependencies + krb5-libs \ + libgcc \ + libintl \ + libssl1.1 \ + libstdc++ \ + zlib + +# 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 \ + # Set the invariant mode since icu_libs isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true diff --git a/3.0/runtime/alpine3.11/amd64/Dockerfile b/3.0/runtime/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..f43ef1e8fc --- /dev/null +++ b/3.0/runtime/alpine3.11/amd64/Dockerfile @@ -0,0 +1,13 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.0-alpine3.11 + +# Install .NET Core +ENV DOTNET_VERSION 3.0.1 + +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='90d2bdf1b774267a66daf18dfe0795348e8c2ef562d166d13f676eadcd130aa0f0bb96b4b2a39cb0486d8e483b6c4614b9f2e1c3a997ced293484f976f61bbe0' \ + && 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/3.0/runtime/alpine3.11/arm64v8/Dockerfile b/3.0/runtime/alpine3.11/arm64v8/Dockerfile new file mode 100644 index 0000000000..d7ceb8946f --- /dev/null +++ b/3.0/runtime/alpine3.11/arm64v8/Dockerfile @@ -0,0 +1,13 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.0-alpine3.11-arm64v8 + +# Install .NET Core +ENV DOTNET_VERSION 3.0.1 + +RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-arm64.tar.gz \ + && dotnet_sha512='1d78dac1dd7db6585a10436a41440921f060de71daad155ca76451a472496d54eaec575b289556d51681855368fb23d301921fb2e0562d7f2ef7bc94ee5ddfb4' \ + && 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/3.0/sdk/alpine3.11/amd64/Dockerfile b/3.0/sdk/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..a634f238bc --- /dev/null +++ b/3.0/sdk/alpine3.11/amd64/Dockerfile @@ -0,0 +1,47 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.0-alpine3.11 + +# 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 3.0.101 + +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='98cc98f58187d208bd388f8c71862ea75e50ca25666e265f40a4e7c28082c2784738172e8ae4af7815057f7c57072cbe4fc03301d01738fc1ed5bb5e4d30a363' \ + && 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 + +# Unset the value from the base image +ENV ASPNETCORE_URLS= \ + # 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 +RUN dotnet help + +# Install PowerShell global tool +ENV POWERSHELL_VERSION=7.0.0-preview.4 \ + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Alpine-3.10 + +RUN wget -O PowerShell.Linux.Alpine.$POWERSHELL_VERSION.nupkg https://pwshtool.blob.core.windows.net/tool/$POWERSHELL_VERSION/PowerShell.Linux.Alpine.$POWERSHELL_VERSION.nupkg \ + && powershell_sha512='25dc93d87e4a0ae94fd161ff3b2d26b0e0eb5ae69a913500f7816debd705d1b84fcebb147b8a02d5fc53cf2718ec3d65dc0f2b73e0e4b917599b6562cf140c39' \ + && echo "$powershell_sha512 PowerShell.Linux.Alpine.$POWERSHELL_VERSION.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $POWERSHELL_VERSION PowerShell.Linux.Alpine \ + && rm PowerShell.Linux.Alpine.$POWERSHELL_VERSION.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \ + # Add ncurses-terminfo-base to resolve psreadline dependency + && apk add --no-cache ncurses-terminfo-base diff --git a/3.1/aspnet/alpine3.11/amd64/Dockerfile b/3.1/aspnet/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..87b4d73c42 --- /dev/null +++ b/3.1/aspnet/alpine3.11/amd64/Dockerfile @@ -0,0 +1,10 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime +FROM $REPO:3.1-alpine3.11 + +# Install ASP.NET Core +RUN aspnetcore_version=3.1.0 \ + && 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='fa5e4ae71134a8a6db4ad6a247d3e31406673e03f0a64f7faaad3d84cfb3b70d2cf69e9d9abc1f8688138907d4ddd37cd908669999d85a87892e164053c63847' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -ozxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz diff --git a/3.1/aspnet/alpine3.11/arm64v8/Dockerfile b/3.1/aspnet/alpine3.11/arm64v8/Dockerfile new file mode 100644 index 0000000000..41592e1c24 --- /dev/null +++ b/3.1/aspnet/alpine3.11/arm64v8/Dockerfile @@ -0,0 +1,10 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime +FROM $REPO:3.1-alpine3.11-arm64v8 + +# Install ASP.NET Core +RUN aspnetcore_version=3.1.0 \ + && wget -O aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ + && aspnetcore_sha512='6244dd1dd7d18f00bcc6a1faa2b6da61bc3edc9748f9513b617c84b1c2cb04d3b7328f398ce9a1e9834db56bb6246756b7c5409c179000eaab113a88a2da5b3a' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -ozxf aspnetcore.tar.gz -C /usr/share/dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz diff --git a/3.1/runtime/alpine3.11/amd64/Dockerfile b/3.1/runtime/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..afa0e78be6 --- /dev/null +++ b/3.1/runtime/alpine3.11/amd64/Dockerfile @@ -0,0 +1,12 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.1-alpine3.11 + +# Install .NET Core +RUN dotnet_version=3.1.0 \ + && wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ + && dotnet_sha512='040e55c341aa15357bd7e1ee4fd421f13056aac2eaf9f327c77fd1948fbe963d23a66cc5ffdfaa232407853fd250922327107e2878bf0af9a7652fd2c4c46815' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + && rm dotnet.tar.gz diff --git a/3.1/runtime/alpine3.11/arm64v8/Dockerfile b/3.1/runtime/alpine3.11/arm64v8/Dockerfile new file mode 100644 index 0000000000..9920ec8932 --- /dev/null +++ b/3.1/runtime/alpine3.11/arm64v8/Dockerfile @@ -0,0 +1,12 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.1-alpine3.11-arm64v8 + +# Install .NET Core +RUN dotnet_version=3.1.0 \ + && wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ + && dotnet_sha512='417858bb24e1ec7337c7b85dd2c16ba3b16182bb0839e7c67d46b4ba38d430dd95a58e5ec533586c0cd4b69fc0f82323297eb4c5fbd8c2e8a5f9a1d36a3658f9' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + && rm dotnet.tar.gz diff --git a/3.1/sdk/alpine3.11/amd64/Dockerfile b/3.1/sdk/alpine3.11/amd64/Dockerfile new file mode 100644 index 0000000000..49fa8ecdb6 --- /dev/null +++ b/3.1/sdk/alpine3.11/amd64/Dockerfile @@ -0,0 +1,47 @@ +ARG REPO=mcr.microsoft.com/dotnet/core/runtime-deps +FROM $REPO:3.1-alpine3.11 + +ENV \ + # Unset the value from the base image + ASPNETCORE_URLS= \ + # Disable the invariant mode (set in base image) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ + # Enable correct mode for dotnet watch (only mode supported in a container) + DOTNET_USE_POLLING_FILE_WATCHER=true \ + LC_ALL=en_US.UTF-8 \ + LANG=en_US.UTF-8 \ + # Skip extraction of XML docs - generally not useful within an image/container - helps performance + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Alpine-3.10 + +# Add dependencies for disabling invariant mode (set in base image) +RUN apk add --no-cache icu-libs + +# Install .NET Core SDK +RUN dotnet_sdk_version=3.1.100 \ + && 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='517c1dadbc9081e112f75589eb7160ef70183eb3d93fd55800e145b21f4dd6f5fbe19397ee7476aa16493e112ef95b311ff61bb08d9231b30a7ea609806d85ee' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ + && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ + && rm dotnet.tar.gz \ + # Trigger first run experience by running arbitrary cmd + && dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.0.0-rc.1 \ + && wget -O PowerShell.Linux.Alpine.$powershell_version.nupkg https://pwshtool.blob.core.windows.net/tool/$powershell_version/PowerShell.Linux.Alpine.$powershell_version.nupkg \ + && powershell_sha512='f7c2172ba1ef2a82a14501922e3235f85c35ccb8c1a1405302f1b5280c49312de63098af09c7dbe836ed5db989174528d695e352cc8152ad5f7d75bae9efdd33' \ + && echo "$powershell_sha512 PowerShell.Linux.Alpine.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.Alpine \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.Alpine.$powershell_version.nupkg \ + && chmod 755 /usr/share/powershell/pwsh \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm \ + # Add ncurses-terminfo-base to resolve psreadline dependency + && apk add --no-cache ncurses-terminfo-base diff --git a/README.aspnet.md b/README.aspnet.md index 8e182f3895..c90aece5ea 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -56,23 +56,28 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim, 3.1-buster-slim, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/buster-slim/amd64/Dockerfile) | Debian 10 -3.1.1-alpine3.10, 3.1-alpine3.10, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11, 3.1-alpine3.11, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10, 3.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.1.1-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim, 3.0-buster-slim, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/buster-slim/amd64/Dockerfile) | Debian 10 -3.0.2-alpine3.10, 3.0-alpine3.10, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11, 3.0-alpine3.11, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10, 3.0-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.0.2-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.15-stretch-slim, 2.1-stretch-slim, 2.1.15, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/amd64/Dockerfile) | Debian 9 -2.1.15-alpine3.10, 2.1-alpine3.10, 2.1.15-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.15-alpine3.11, 2.1-alpine3.11, 2.1.15-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +2.1.15-alpine3.10, 2.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.15-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.1.1-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim-arm64v8, 3.0-buster-slim-arm64v8, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11-arm64v8, 3.0-alpine3.11-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.0.2-bionic-arm64v8, 3.0-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/aspnet/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 ## Linux arm32 Tags diff --git a/README.runtime-deps.md b/README.runtime-deps.md index bd7bf4f23d..f398ddb51c 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -44,23 +44,28 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim, 3.1-buster-slim, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10 -3.1.1-alpine3.10, 3.1-alpine3.10, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11, 3.1-alpine3.11, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10, 3.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.1.1-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim, 3.0-buster-slim, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10 -3.0.2-alpine3.10, 3.0-alpine3.10, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11, 3.0-alpine3.11, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10, 3.0-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.0.2-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.15-stretch-slim, 2.1-stretch-slim, 2.1.15, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/amd64/Dockerfile) | Debian 9 -2.1.15-alpine3.10, 2.1-alpine3.10, 2.1.15-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.15-alpine3.11, 2.1-alpine3.11, 2.1.15-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +2.1.15-alpine3.10, 2.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.15-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.1.1-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim-arm64v8, 3.0-buster-slim-arm64v8, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11-arm64v8, 3.0-alpine3.11-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.0.2-bionic-arm64v8, 3.0-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime-deps/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 ## Linux arm32 Tags diff --git a/README.runtime.md b/README.runtime.md index fed6a47ec6..9fd8e33619 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -52,23 +52,28 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim, 3.1-buster-slim, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/buster-slim/amd64/Dockerfile) | Debian 10 -3.1.1-alpine3.10, 3.1-alpine3.10, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11, 3.1-alpine3.11, 3.1.1-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10, 3.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.1.1-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim, 3.0-buster-slim, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/buster-slim/amd64/Dockerfile) | Debian 10 -3.0.2-alpine3.10, 3.0-alpine3.10, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11, 3.0-alpine3.11, 3.0.2-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10, 3.0-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.0.2-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.15-stretch-slim, 2.1-stretch-slim, 2.1.15, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/amd64/Dockerfile) | Debian 9 -2.1.15-alpine3.10, 2.1-alpine3.10, 2.1.15-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.15-alpine3.11, 2.1-alpine3.11, 2.1.15-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +2.1.15-alpine3.10, 2.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.15-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.1-buster-slim-arm64v8, 3.1-buster-slim-arm64v8, 3.1.1, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.1.1-alpine3.11-arm64v8, 3.1-alpine3.11-arm64v8, 3.1.1-alpine-arm64v8, 3.1-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.1.1-alpine3.10-arm64v8, 3.1-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.1.1-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 3.0.2-buster-slim-arm64v8, 3.0-buster-slim-arm64v8, 3.0.2, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10 -3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 +3.0.2-alpine3.11-arm64v8, 3.0-alpine3.11-arm64v8, 3.0.2-alpine-arm64v8, 3.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +3.0.2-alpine3.10-arm64v8, 3.0-alpine3.10-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/alpine3.10/arm64v8/Dockerfile) | Alpine 3.10 3.0.2-bionic-arm64v8, 3.0-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/runtime/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 ## Linux arm32 Tags diff --git a/README.sdk.md b/README.sdk.md index 17f7a9c3fa..b9e8bf4cac 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -56,13 +56,16 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast Tags | Dockerfile | OS Version -----------| -------------| ------------- 3.1.101-buster, 3.1-buster, 3.1.101, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/buster/amd64/Dockerfile) | Debian 10 -3.1.101-alpine3.10, 3.1-alpine3.10, 3.1.101-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.1.101-alpine3.11, 3.1-alpine3.11, 3.1.101-alpine, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.1.101-alpine3.10, 3.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.1.101-bionic, 3.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 3.0.102-buster, 3.0-buster, 3.0.102, 3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/buster/amd64/Dockerfile) | Debian 10 -3.0.102-alpine3.10, 3.0-alpine3.10, 3.0.102-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 +3.0.102-alpine3.11, 3.0-alpine3.11, 3.0.102-alpine, 3.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +3.0.102-alpine3.10, 3.0-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 3.0.102-bionic, 3.0-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.0/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 2.1.803-stretch, 2.1-stretch, 2.1.803, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/amd64/Dockerfile) | Debian 9 -2.1.803-alpine3.10, 2.1-alpine3.10, 2.1.803-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.803-alpine3.11, 2.1-alpine3.11, 2.1.803-alpine, 2.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +2.1.803-alpine3.10, 2.1-alpine3.10 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/alpine3.10/amd64/Dockerfile) | Alpine 3.10 2.1.803-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 ## Linux arm64 Tags diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 9cc08d5efb..192ec3a88a 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -1,19 +1,24 @@ $(McrTagsYmlRepo:aspnet) $(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) $(McrTagsYmlTagGroup:3.1-alpine3.10) $(McrTagsYmlTagGroup:3.1-bionic) $(McrTagsYmlTagGroup:3.0-buster-slim) +$(McrTagsYmlTagGroup:3.0-alpine3.11) $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) $(McrTagsYmlTagGroup:3.1-bionic-arm32v7) $(McrTagsYmlTagGroup:3.0-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.0-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.0-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.0-bionic-arm64v8) $(McrTagsYmlTagGroup:3.0-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index 8b871a0326..4c062ad554 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -1,17 +1,22 @@ $(McrTagsYmlRepo:runtime-deps) $(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) $(McrTagsYmlTagGroup:3.1-alpine3.10) $(McrTagsYmlTagGroup:3.1-bionic) $(McrTagsYmlTagGroup:3.0-buster-slim) +$(McrTagsYmlTagGroup:3.0-alpine3.11) $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:3.0-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.0-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.0-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.0-bionic-arm64v8) $(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 7cd16663ba..eea2ba0681 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -1,17 +1,22 @@ $(McrTagsYmlRepo:runtime) $(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) $(McrTagsYmlTagGroup:3.1-alpine3.10) $(McrTagsYmlTagGroup:3.1-bionic) $(McrTagsYmlTagGroup:3.0-buster-slim) +$(McrTagsYmlTagGroup:3.0-alpine3.11) $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-bionic) $(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.1-bionic-arm64v8) $(McrTagsYmlTagGroup:3.0-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.0-alpine3.11-arm64v8) $(McrTagsYmlTagGroup:3.0-alpine3.10-arm64v8) $(McrTagsYmlTagGroup:3.0-bionic-arm64v8) $(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index ae7d15fc4e..68c271abde 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -1,11 +1,14 @@ $(McrTagsYmlRepo:sdk) $(McrTagsYmlTagGroup:3.1-buster) +$(McrTagsYmlTagGroup:3.1-alpine3.11) $(McrTagsYmlTagGroup:3.1-alpine3.10) $(McrTagsYmlTagGroup:3.1-bionic) $(McrTagsYmlTagGroup:3.0-buster) +$(McrTagsYmlTagGroup:3.0-alpine3.11) $(McrTagsYmlTagGroup:3.0-alpine3.10) $(McrTagsYmlTagGroup:3.0-bionic) $(McrTagsYmlTagGroup:2.1-stretch) +$(McrTagsYmlTagGroup:2.1-alpine3.11) $(McrTagsYmlTagGroup:2.1-alpine3.10) $(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:3.1-buster-arm64v8) diff --git a/manifest.json b/manifest.json index 0ba88799ff..6ce66aef6f 100644 --- a/manifest.json +++ b/manifest.json @@ -68,6 +68,23 @@ }, "2.1-alpine3.10": { "documentationGroup": "2.1" + } + } + } + ] + }, + { + "platforms": [ + { + "dockerfile": "2.1/runtime-deps/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(2.1-RuntimeVersion)-alpine3.11": { + "documentationGroup": "2.1" + }, + "2.1-alpine3.11": { + "documentationGroup": "2.1" }, "$(2.1-RuntimeVersion)-alpine": { "documentationGroup": "2.1" @@ -210,16 +227,64 @@ "3.0-alpine3.10": { "documentationGroup": "3.0" }, + "$(3.1-RuntimeVersion)-alpine3.10": { + "documentationGroup": "3.1" + }, + "3.1-alpine3.10": { + "documentationGroup": "3.1" + } + } + } + ] + }, + { + "platforms": [ + { + "architecture": "arm64", + "dockerfile": "3.0/runtime-deps/alpine3.10/arm64v8", + "os": "linux", + "osVersion": "alpine3.10", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.10-arm64v8": { + "documentationGroup": "3.0" + }, + "3.0-alpine3.10-arm64v8": { + "documentationGroup": "3.0" + }, + "$(3.1-RuntimeVersion)-alpine3.10-arm64v8": { + "documentationGroup": "3.1" + }, + "3.1-alpine3.10-arm64v8": { + "documentationGroup": "3.1" + } + }, + "variant": "v8" + } + ] + }, + { + "platforms": [ + { + "dockerfile": "3.0/runtime-deps/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.11": { + "documentationGroup": "3.0" + }, + "3.0-alpine3.11": { + "documentationGroup": "3.0" + }, "$(3.0-RuntimeVersion)-alpine": { "documentationGroup": "3.0" }, "3.0-alpine": { "documentationGroup": "3.0" }, - "$(3.1-RuntimeVersion)-alpine3.10": { + "$(3.1-RuntimeVersion)-alpine3.11": { "documentationGroup": "3.1" }, - "3.1-alpine3.10": { + "3.1-alpine3.11": { "documentationGroup": "3.1" }, "$(3.1-RuntimeVersion)-alpine": { @@ -236,14 +301,14 @@ "platforms": [ { "architecture": "arm64", - "dockerfile": "3.0/runtime-deps/alpine3.10/arm64v8", + "dockerfile": "3.0/runtime-deps/alpine3.11/arm64v8", "os": "linux", - "osVersion": "alpine3.10", + "osVersion": "alpine3.11", "tags": { - "$(3.0-RuntimeVersion)-alpine3.10-arm64v8": { + "$(3.0-RuntimeVersion)-alpine3.11-arm64v8": { "documentationGroup": "3.0" }, - "3.0-alpine3.10-arm64v8": { + "3.0-alpine3.11-arm64v8": { "documentationGroup": "3.0" }, "$(3.0-RuntimeVersion)-alpine-arm64v8": { @@ -252,10 +317,10 @@ "3.0-alpine-arm64v8": { "documentationGroup": "3.0" }, - "$(3.1-RuntimeVersion)-alpine3.10-arm64v8": { + "$(3.1-RuntimeVersion)-alpine3.11-arm64v8": { "documentationGroup": "3.1" }, - "3.1-alpine3.10-arm64v8": { + "3.1-alpine3.11-arm64v8": { "documentationGroup": "3.1" }, "$(3.1-RuntimeVersion)-alpine-arm64v8": { @@ -422,7 +487,23 @@ "osVersion": "alpine3.10", "tags": { "$(2.1-RuntimeVersion)-alpine3.10": {}, - "2.1-alpine3.10": {}, + "2.1-alpine3.10": {} + } + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "2.1/runtime/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(2.1-RuntimeVersion)-alpine3.11": {}, + "2.1-alpine3.11": {}, "$(2.1-RuntimeVersion)-alpine": {}, "2.1-alpine": {} } @@ -559,9 +640,7 @@ "osVersion": "alpine3.10", "tags": { "$(3.0-RuntimeVersion)-alpine3.10": {}, - "3.0-alpine3.10": {}, - "$(3.0-RuntimeVersion)-alpine": {}, - "3.0-alpine": {} + "3.0-alpine3.10": {} } } ] @@ -578,7 +657,51 @@ "osVersion": "alpine3.10", "tags": { "$(3.0-RuntimeVersion)-alpine3.10-arm64v8": {}, - "3.0-alpine3.10-arm64v8": {}, + "3.0-alpine3.10-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGrouping": [ + { + "name": "pr-build", + "dependencies": [ + "$(Repo:sdk):3.0-buster-arm64v8" + ] + } + ] + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.0/runtime/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.11": {}, + "3.0-alpine3.11": {}, + "$(3.0-RuntimeVersion)-alpine": {}, + "3.0-alpine": {} + } + } + ] + }, + { + "platforms": [ + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.0/runtime/alpine3.11/arm64v8", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.11-arm64v8": {}, + "3.0-alpine3.11-arm64v8": {}, "$(3.0-RuntimeVersion)-alpine-arm64v8": {}, "3.0-alpine-arm64v8": {} }, @@ -743,9 +866,7 @@ "osVersion": "alpine3.10", "tags": { "$(3.1-RuntimeVersion)-alpine3.10": {}, - "3.1-alpine3.10": {}, - "$(3.1-RuntimeVersion)-alpine": {}, - "3.1-alpine": {} + "3.1-alpine3.10": {} } } ] @@ -762,7 +883,51 @@ "osVersion": "alpine3.10", "tags": { "$(3.1-RuntimeVersion)-alpine3.10-arm64v8": {}, - "3.1-alpine3.10-arm64v8": {}, + "3.1-alpine3.10-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGrouping": [ + { + "name": "pr-build", + "dependencies": [ + "$(Repo:sdk):3.1-buster-arm64v8" + ] + } + ] + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.1/runtime/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.1-RuntimeVersion)-alpine3.11": {}, + "3.1-alpine3.11": {}, + "$(3.1-RuntimeVersion)-alpine": {}, + "3.1-alpine": {} + } + } + ] + }, + { + "platforms": [ + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.1/runtime/alpine3.11/arm64v8", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.1-RuntimeVersion)-alpine3.11-arm64v8": {}, + "3.1-alpine3.11-arm64v8": {}, "$(3.1-RuntimeVersion)-alpine-arm64v8": {}, "3.1-alpine-arm64v8": {} }, @@ -910,7 +1075,23 @@ "osVersion": "alpine3.10", "tags": { "$(2.1-RuntimeVersion)-alpine3.10": {}, - "2.1-alpine3.10": {}, + "2.1-alpine3.10": {} + } + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "2.1/aspnet/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(2.1-RuntimeVersion)-alpine3.11": {}, + "2.1-alpine3.11": {}, "$(2.1-RuntimeVersion)-alpine": {}, "2.1-alpine": {} } @@ -1059,9 +1240,7 @@ "osVersion": "alpine3.10", "tags": { "$(3.0-RuntimeVersion)-alpine3.10": {}, - "3.0-alpine3.10": {}, - "$(3.0-RuntimeVersion)-alpine": {}, - "3.0-alpine": {} + "3.0-alpine3.10": {} } } ] @@ -1078,7 +1257,51 @@ "osVersion": "alpine3.10", "tags": { "$(3.0-RuntimeVersion)-alpine3.10-arm64v8": {}, - "3.0-alpine3.10-arm64v8": {}, + "3.0-alpine3.10-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGrouping": [ + { + "name": "pr-build", + "dependencies": [ + "$(Repo:sdk):3.0-buster-arm64v8" + ] + } + ] + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "3.0/aspnet/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.11": {}, + "3.0-alpine3.11": {}, + "$(3.0-RuntimeVersion)-alpine": {}, + "3.0-alpine": {} + } + } + ] + }, + { + "platforms": [ + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "3.0/aspnet/alpine3.11/arm64v8", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-RuntimeVersion)-alpine3.11-arm64v8": {}, + "3.0-alpine3.11-arm64v8": {}, "$(3.0-RuntimeVersion)-alpine-arm64v8": {}, "3.0-alpine-arm64v8": {} }, @@ -1255,9 +1478,7 @@ "osVersion": "alpine3.10", "tags": { "$(3.1-RuntimeVersion)-alpine3.10": {}, - "3.1-alpine3.10": {}, - "$(3.1-RuntimeVersion)-alpine": {}, - "3.1-alpine": {} + "3.1-alpine3.10": {} } } ] @@ -1274,7 +1495,51 @@ "osVersion": "alpine3.10", "tags": { "$(3.1-RuntimeVersion)-alpine3.10-arm64v8": {}, - "3.1-alpine3.10-arm64v8": {}, + "3.1-alpine3.10-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGrouping": [ + { + "name": "pr-build", + "dependencies": [ + "$(Repo:sdk):3.1-buster-arm64v8" + ] + } + ] + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "3.1/aspnet/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.1-RuntimeVersion)-alpine3.11": {}, + "3.1-alpine3.11": {}, + "$(3.1-RuntimeVersion)-alpine": {}, + "3.1-alpine": {} + } + } + ] + }, + { + "platforms": [ + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "3.1/aspnet/alpine3.11/arm64v8", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.1-RuntimeVersion)-alpine3.11-arm64v8": {}, + "3.1-alpine3.11-arm64v8": {}, "$(3.1-RuntimeVersion)-alpine-arm64v8": {}, "3.1-alpine-arm64v8": {} }, @@ -1416,7 +1681,23 @@ "osVersion": "alpine3.10", "tags": { "$(2.1-SdkVersion)-alpine3.10": {}, - "2.1-alpine3.10": {}, + "2.1-alpine3.10": {} + } + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "2.1/sdk/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(2.1-SdkVersion)-alpine3.11": {}, + "2.1-alpine3.11": {}, "$(2.1-SdkVersion)-alpine": {}, "2.1-alpine": {} } @@ -1538,7 +1819,23 @@ "osVersion": "alpine3.10", "tags": { "$(3.0-SdkVersion)-alpine3.10": {}, - "3.0-alpine3.10": {}, + "3.0-alpine3.10": {} + } + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.0/sdk/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.0-SdkVersion)-alpine3.11": {}, + "3.0-alpine3.11": {}, "$(3.0-SdkVersion)-alpine": {}, "3.0-alpine": {} } @@ -1676,7 +1973,23 @@ "osVersion": "alpine3.10", "tags": { "$(3.1-SdkVersion)-alpine3.10": {}, - "3.1-alpine3.10": {}, + "3.1-alpine3.10": {} + } + } + ] + }, + { + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "3.1/sdk/alpine3.11/amd64", + "os": "linux", + "osVersion": "alpine3.11", + "tags": { + "$(3.1-SdkVersion)-alpine3.11": {}, + "3.1-alpine3.11": {}, "$(3.1-SdkVersion)-alpine": {}, "3.1-alpine": {} } diff --git a/tests/Microsoft.DotNet.Docker.Tests/OS.cs b/tests/Microsoft.DotNet.Docker.Tests/OS.cs index 9155ad2809..1859c2bbb1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/OS.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/OS.cs @@ -8,6 +8,7 @@ public class OS { // Alpine public const string Alpine310 = "alpine3.10"; + public const string Alpine311 = "alpine3.11"; // Debian public const string Buster = "buster"; diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 4f9c85e616..d175e836b0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -17,24 +17,29 @@ public static class TestData new ProductImageData { Version = V2_1, OS = OS.StretchSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V2_1, OS = OS.Bionic, Arch = Arch.Amd64 }, new ProductImageData { Version = V2_1, OS = OS.Alpine310, Arch = Arch.Amd64 }, + new ProductImageData { Version = V2_1, OS = OS.Alpine311, 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 = V3_0, OS = OS.BusterSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.Bionic, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.Alpine310, Arch = Arch.Amd64 }, + new ProductImageData { Version = V3_0, OS = OS.Alpine311, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_0, OS = OS.BusterSlim, Arch = Arch.Arm }, new ProductImageData { Version = V3_0, OS = OS.Bionic, Arch = Arch.Arm }, new ProductImageData { Version = V3_0, OS = OS.BusterSlim, Arch = Arch.Arm64 }, new ProductImageData { Version = V3_0, OS = OS.Bionic, Arch = Arch.Arm64 }, - new ProductImageData { Version = V3_0, OS = OS.Alpine310, Arch = Arch.Arm64, SdkOS = OS.Buster }, + new ProductImageData { Version = V3_0, OS = OS.Alpine310, Arch = Arch.Arm64, SdkOS = OS.Buster }, + new ProductImageData { Version = V3_0, OS = OS.Alpine311, Arch = Arch.Arm64, SdkOS = OS.Buster }, new ProductImageData { Version = V3_1, OS = OS.BusterSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_1, OS = OS.Bionic, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_1, OS = OS.Alpine310, Arch = Arch.Amd64 }, + new ProductImageData { Version = V3_1, OS = OS.Alpine311, Arch = Arch.Amd64 }, new ProductImageData { Version = V3_1, OS = OS.BusterSlim, Arch = Arch.Arm }, new ProductImageData { Version = V3_1, OS = OS.Bionic, Arch = Arch.Arm }, new ProductImageData { Version = V3_1, OS = OS.BusterSlim, Arch = Arch.Arm64 }, new ProductImageData { Version = V3_1, OS = OS.Bionic, Arch = Arch.Arm64 }, - new ProductImageData { Version = V3_1, OS = OS.Alpine310, Arch = Arch.Arm64, SdkOS = OS.Buster }, + new ProductImageData { Version = V3_1, OS = OS.Alpine310, Arch = Arch.Arm64, SdkOS = OS.Buster }, + new ProductImageData { Version = V3_1, OS = OS.Alpine311, Arch = Arch.Arm64, SdkOS = OS.Buster }, }; private static readonly ProductImageData[] s_windowsTestData = { diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index 7621dfabb0..a85b3218a3 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -3,6 +3,7 @@ "2.1/runtime-deps/stretch-slim/amd64": 99052362, "2.1/runtime-deps/stretch-slim/arm32v7": 79329954, "2.1/runtime-deps/alpine3.10/amd64": 12030612, + "2.1/runtime-deps/alpine3.11/amd64": 12333463, "2.1/runtime-deps/bionic/amd64": 111095589, "2.1/runtime-deps/bionic/arm32v7": 87327705, "3.0/runtime-deps/buster-slim/amd64": 110537404, @@ -10,6 +11,8 @@ "3.0/runtime-deps/buster-slim/arm64v8": 104153752, "3.0/runtime-deps/alpine3.10/amd64": 9630623, "3.0/runtime-deps/alpine3.10/arm64v8": 9446928, + "3.0/runtime-deps/alpine3.11/amd64": 9937498, + "3.0/runtime-deps/alpine3.11/arm64v8": 9733357, "3.0/runtime-deps/bionic/amd64": 106459634, "3.0/runtime-deps/bionic/arm32v7": 84576709, "3.0/runtime-deps/bionic/arm64v8": 99094631, @@ -21,6 +24,7 @@ "2.1/runtime/stretch-slim/amd64": 180258057, "2.1/runtime/stretch-slim/arm32v7": 153626488, "2.1/runtime/alpine3.10/amd64": 86389929, + "2.1/runtime/alpine3.11/amd64": 86692780, "2.1/runtime/bionic/amd64": 191246153, "2.1/runtime/bionic/arm32v7": 160181517, "3.0/runtime/buster-slim/amd64": 189269536, @@ -28,6 +32,8 @@ "3.0/runtime/buster-slim/arm64v8": 196987734, "3.0/runtime/alpine3.10/amd64": 86822680, "3.0/runtime/alpine3.10/arm64v8": 99278479, + "3.0/runtime/alpine3.11/amd64": 87129555, + "3.0/runtime/alpine3.11/arm64v8": 99564908, "3.0/runtime/bionic/amd64": 178427811, "3.0/runtime/bionic/arm32v7": 164252991, "3.0/runtime/bionic/arm64v8": 192603072, @@ -36,6 +42,8 @@ "3.1/runtime/buster-slim/arm64v8": 197045040, "3.1/runtime/alpine3.10/amd64": 86876554, "3.1/runtime/alpine3.10/arm64v8": 99327593, + "3.1/runtime/alpine3.11/amd64": 87183429, + "3.1/runtime/alpine3.11/arm64v8": 99614022, "3.1/runtime/bionic/amd64": 186917824, "3.1/runtime/bionic/arm32v7": 164509053, "3.1/runtime/bionic/arm64v8": 192660378, @@ -47,6 +55,7 @@ "2.1/aspnet/stretch-slim/amd64": 253015005, "2.1/aspnet/stretch-slim/arm32v7": 189706192, "2.1/aspnet/alpine3.10/amd64": 159349555, + "2.1/aspnet/alpine3.11/amd64": 159652406, "2.1/aspnet/bionic/amd64": 264145799, "2.1/aspnet/bionic/arm32v7": 196255401, "3.0/aspnet/buster-slim/amd64": 206965810, @@ -54,6 +63,8 @@ "3.0/aspnet/buster-slim/arm64v8": 218128754, "3.0/aspnet/alpine3.10/amd64": 104518979, "3.0/aspnet/alpine3.10/arm64v8": 120419524, + "3.0/aspnet/alpine3.11/amd64": 104825854, + "3.0/aspnet/alpine3.11/arm64v8": 120705953, "3.0/aspnet/bionic/amd64": 194900630, "3.0/aspnet/bionic/arm32v7": 184624465, "3.0/aspnet/bionic/arm64v8": 213744092, @@ -62,6 +73,8 @@ "3.1/aspnet/buster-slim/arm64v8": 218270150, "3.1/aspnet/alpine3.10/amd64": 104649263, "3.1/aspnet/alpine3.10/arm64v8": 120552728, + "3.1/aspnet/alpine3.11/amd64": 104956138, + "3.1/aspnet/alpine3.11/arm64v8": 120839157, "3.1/aspnet/bionic/amd64": 204690508, "3.1/aspnet/bionic/arm32v7": 184974857, "3.1/aspnet/bionic/arm64v8": 213885488, @@ -73,12 +86,14 @@ "2.1/sdk/stretch/amd64": 1728622878, "2.1/sdk/stretch/arm32v7": 1580645025, "2.1/sdk/alpine3.10/amd64": 1475781904, + "2.1/sdk/alpine3.11/amd64": 1476090658, "2.1/sdk/bionic/amd64": 1705835924, "2.1/sdk/bionic/arm32v7": 1551712848, "3.0/sdk/buster/amd64": 697608667, "3.0/sdk/buster/arm32v7": 649327560, "3.0/sdk/buster/arm64v8": 714965692, "3.0/sdk/alpine3.10/amd64": 406003064, + "3.0/sdk/alpine3.11/amd64": 406315889, "3.0/sdk/bionic/amd64": 622412878, "3.0/sdk/bionic/arm32v7": 580725112, "3.0/sdk/bionic/arm64v8": 641689415, @@ -86,6 +101,7 @@ "3.1/sdk/buster/arm32v7": 644889584, "3.1/sdk/buster/arm64v8": 712029090, "3.1/sdk/alpine3.10/amd64": 405080569, + "3.1/sdk/alpine3.11/amd64": 405393358, "3.1/sdk/bionic/amd64": 612746608, "3.1/sdk/bionic/arm32v7": 571858059, "3.1/sdk/bionic/arm64v8": 629031352,