From 45fd06181e16b5aa116c022ad11e325d861d71c0 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 11 Aug 2017 15:39:28 -0500 Subject: [PATCH] Add 2.1 Dockerfiles --- 2.1/runtime-deps/jessie/amd64/Dockerfile | 19 +++ 2.1/runtime-deps/stretch/amd64/Dockerfile | 19 +++ 2.1/runtime-deps/stretch/arm32v7/Dockerfile | 19 +++ 2.1/runtime/jessie/amd64/Dockerfile | 18 +++ 2.1/runtime/nanoserver/amd64/Dockerfile | 19 +++ 2.1/runtime/stretch/amd64/Dockerfile | 18 +++ 2.1/runtime/stretch/arm32v7/Dockerfile | 18 +++ 2.1/sdk/jessie/amd64/Dockerfile | 38 +++++ 2.1/sdk/nanoserver/amd64/Dockerfile | 27 ++++ 2.1/sdk/stretch/amd64/Dockerfile | 38 +++++ README.md | 30 ++-- build-pipeline/pipeline.json | 18 +++ manifest.json | 167 ++++++++++++++++++-- netci.groovy | 2 +- test/run-test.ps1 | 12 +- 15 files changed, 434 insertions(+), 28 deletions(-) create mode 100644 2.1/runtime-deps/jessie/amd64/Dockerfile create mode 100644 2.1/runtime-deps/stretch/amd64/Dockerfile create mode 100644 2.1/runtime-deps/stretch/arm32v7/Dockerfile create mode 100644 2.1/runtime/jessie/amd64/Dockerfile create mode 100644 2.1/runtime/nanoserver/amd64/Dockerfile create mode 100644 2.1/runtime/stretch/amd64/Dockerfile create mode 100644 2.1/runtime/stretch/arm32v7/Dockerfile create mode 100644 2.1/sdk/jessie/amd64/Dockerfile create mode 100644 2.1/sdk/nanoserver/amd64/Dockerfile create mode 100644 2.1/sdk/stretch/amd64/Dockerfile diff --git a/2.1/runtime-deps/jessie/amd64/Dockerfile b/2.1/runtime-deps/jessie/amd64/Dockerfile new file mode 100644 index 0000000..70b8873 --- /dev/null +++ b/2.1/runtime-deps/jessie/amd64/Dockerfile @@ -0,0 +1,19 @@ +FROM debian:jessie + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ +# .NET Core dependencies + libc6 \ + libcurl3 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu52 \ + liblttng-ust0 \ + libssl1.0.0 \ + libstdc++6 \ + libunwind8 \ + libuuid1 \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* diff --git a/2.1/runtime-deps/stretch/amd64/Dockerfile b/2.1/runtime-deps/stretch/amd64/Dockerfile new file mode 100644 index 0000000..12615b5 --- /dev/null +++ b/2.1/runtime-deps/stretch/amd64/Dockerfile @@ -0,0 +1,19 @@ +FROM debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ +# .NET Core dependencies + libc6 \ + libcurl3 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu57 \ + liblttng-ust0 \ + libssl1.0.2 \ + libstdc++6 \ + libunwind8 \ + libuuid1 \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* diff --git a/2.1/runtime-deps/stretch/arm32v7/Dockerfile b/2.1/runtime-deps/stretch/arm32v7/Dockerfile new file mode 100644 index 0000000..a131b9f --- /dev/null +++ b/2.1/runtime-deps/stretch/arm32v7/Dockerfile @@ -0,0 +1,19 @@ +FROM arm32v7/debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ +# .NET Core dependencies + libc6 \ + libcurl3 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu57 \ + liblttng-ust0 \ + libssl1.0.2 \ + libstdc++6 \ + libunwind8 \ + libuuid1 \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* diff --git a/2.1/runtime/jessie/amd64/Dockerfile b/2.1/runtime/jessie/amd64/Dockerfile new file mode 100644 index 0000000..ac845c1 --- /dev/null +++ b/2.1/runtime/jessie/amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM microsoft/dotnet-nightly:2.1-runtime-deps-jessie + +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.0.0 +ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz +ENV DOTNET_DOWNLOAD_SHA 2D4A3F8CB275C6F98EC7BE36BEF93A3B4E51CC85C418B9F6A5EEF7C4E0DE53B36587AF5CE23A56BC6584B1DE9265C67C0C3136430E02F47F44F9CFE194219178 + +RUN curl -SL $DOTNET_DOWNLOAD_URL --output dotnet.tar.gz \ + && echo "$DOTNET_DOWNLOAD_SHA 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.1/runtime/nanoserver/amd64/Dockerfile b/2.1/runtime/nanoserver/amd64/Dockerfile new file mode 100644 index 0000000..96663c8 --- /dev/null +++ b/2.1/runtime/nanoserver/amd64/Dockerfile @@ -0,0 +1,19 @@ +FROM microsoft/nanoserver:10.0.14393.1593 + +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# Install .NET Core +ENV DOTNET_VERSION 2.0.0 +ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-win-x64.zip +ENV DOTNET_DOWNLOAD_SHA 7D7D0A9B03CB7BB16A2E7B97288B03EABFFB37073C2B025BB9D535CCD51E3F46DB9546A521D5719366DCB6E45529B1B8C54708CF47C619521B556F21F1FFAB59 + +RUN Invoke-WebRequest $Env:DOTNET_DOWNLOAD_URL -OutFile dotnet.zip; \ + if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $Env:DOTNET_DOWNLOAD_SHA) { \ + Write-Host 'CHECKSUM VERIFICATION FAILED!'; \ + exit 1; \ + }; \ + \ + Expand-Archive dotnet.zip -DestinationPath $Env:ProgramFiles\dotnet; \ + Remove-Item -Force dotnet.zip + +RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '\dotnet') diff --git a/2.1/runtime/stretch/amd64/Dockerfile b/2.1/runtime/stretch/amd64/Dockerfile new file mode 100644 index 0000000..e38a2b7 --- /dev/null +++ b/2.1/runtime/stretch/amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM microsoft/dotnet-nightly:2.1-runtime-deps + +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.0.0 +ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-x64.tar.gz +ENV DOTNET_DOWNLOAD_SHA 2D4A3F8CB275C6F98EC7BE36BEF93A3B4E51CC85C418B9F6A5EEF7C4E0DE53B36587AF5CE23A56BC6584B1DE9265C67C0C3136430E02F47F44F9CFE194219178 + +RUN curl -SL $DOTNET_DOWNLOAD_URL --output dotnet.tar.gz \ + && echo "$DOTNET_DOWNLOAD_SHA 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.1/runtime/stretch/arm32v7/Dockerfile b/2.1/runtime/stretch/arm32v7/Dockerfile new file mode 100644 index 0000000..c8cd99e --- /dev/null +++ b/2.1/runtime/stretch/arm32v7/Dockerfile @@ -0,0 +1,18 @@ +FROM microsoft/dotnet-nightly:2.1-runtime-deps-stretch-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.0.0 +ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-arm.tar.gz +ENV DOTNET_DOWNLOAD_SHA 4A16E7AA761714F74B351BE63C86334B5D5FFB88D9FF4FF3C51B3F4F01DC12FE283B9F6E18E2A48776C9B3EE48F1B52D09E0680C645C3CB765761EEFCD0A9459 + +RUN curl -SL $DOTNET_DOWNLOAD_URL --output dotnet.tar.gz \ + && echo "$DOTNET_DOWNLOAD_SHA 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.1/sdk/jessie/amd64/Dockerfile b/2.1/sdk/jessie/amd64/Dockerfile new file mode 100644 index 0000000..fca15c7 --- /dev/null +++ b/2.1/sdk/jessie/amd64/Dockerfile @@ -0,0 +1,38 @@ +FROM buildpack-deps:jessie-scm + +# Install .NET CLI dependencies +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + libc6 \ + libcurl3 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu52 \ + liblttng-ust0 \ + libssl1.0.0 \ + libstdc++6 \ + libunwind8 \ + libuuid1 \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Install .NET Core SDK +ENV DOTNET_SDK_VERSION 2.1.0-preview1-007026 +ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz +ENV DOTNET_SDK_DOWNLOAD_SHA 052BE0B72D196A91B1CC2C57D1E623BF7BBAA4F1BB2E4F204FFA4A4BDFFC653DD8E65E197E6B0DBDCE2F679710EA87B711ADB875391D807B83D282D8185AD9A7 + +RUN curl -SL $DOTNET_SDK_DOWNLOAD_URL --output dotnet.tar.gz \ + && echo "$DOTNET_SDK_DOWNLOAD_SHA 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 + +# Trigger the population of the local package cache +ENV NUGET_XMLDOC_MODE skip +RUN mkdir warmup \ + && cd warmup \ + && dotnet new \ + && cd .. \ + && rm -rf warmup \ + && rm -rf /tmp/NuGetScratch diff --git a/2.1/sdk/nanoserver/amd64/Dockerfile b/2.1/sdk/nanoserver/amd64/Dockerfile new file mode 100644 index 0000000..8e5104e --- /dev/null +++ b/2.1/sdk/nanoserver/amd64/Dockerfile @@ -0,0 +1,27 @@ +FROM microsoft/nanoserver:10.0.14393.1593 + +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# Install .NET Core SDK +ENV DOTNET_SDK_VERSION 2.1.0-preview1-007026 +ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-win-x64.zip +ENV DOTNET_SDK_DOWNLOAD_SHA 401988917CBD8118033C5DE7BACFB99CA6F7B237DEC89BC5DDB8B8D354CC766DB015B37B7D3C310836A52BED5801642A789A34A50224A8FC391ED36C8E1DAA7B + +RUN Invoke-WebRequest $Env:DOTNET_SDK_DOWNLOAD_URL -OutFile dotnet.zip; \ + if ((Get-FileHash dotnet.zip -Algorithm sha512).Hash -ne $Env:DOTNET_SDK_DOWNLOAD_SHA) { \ + Write-Host 'CHECKSUM VERIFICATION FAILED!'; \ + exit 1; \ + }; \ + \ + Expand-Archive dotnet.zip -DestinationPath $Env:ProgramFiles\dotnet; \ + Remove-Item -Force dotnet.zip + +RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '\dotnet') + +# Trigger the population of the local package cache +ENV NUGET_XMLDOC_MODE skip +RUN New-Item -Type Directory warmup; \ + cd warmup; \ + dotnet new; \ + cd ..; \ + Remove-Item -Force -Recurse warmup diff --git a/2.1/sdk/stretch/amd64/Dockerfile b/2.1/sdk/stretch/amd64/Dockerfile new file mode 100644 index 0000000..947e5ca --- /dev/null +++ b/2.1/sdk/stretch/amd64/Dockerfile @@ -0,0 +1,38 @@ +FROM buildpack-deps:stretch-scm + +# Install .NET CLI dependencies +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + libc6 \ + libcurl3 \ + libgcc1 \ + libgssapi-krb5-2 \ + libicu57 \ + liblttng-ust0 \ + libssl1.0.2 \ + libstdc++6 \ + libunwind8 \ + libuuid1 \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Install .NET Core SDK +ENV DOTNET_SDK_VERSION 2.1.0-preview1-007026 +ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz +ENV DOTNET_SDK_DOWNLOAD_SHA 052BE0B72D196A91B1CC2C57D1E623BF7BBAA4F1BB2E4F204FFA4A4BDFFC653DD8E65E197E6B0DBDCE2F679710EA87B711ADB875391D807B83D282D8185AD9A7 + +RUN curl -SL $DOTNET_SDK_DOWNLOAD_URL --output dotnet.tar.gz \ + && echo "$DOTNET_SDK_DOWNLOAD_SHA 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 + +# Trigger the population of the local package cache +ENV NUGET_XMLDOC_MODE skip +RUN mkdir warmup \ + && cd warmup \ + && dotnet new \ + && cd .. \ + && rm -rf warmup \ + && rm -rf /tmp/NuGetScratch diff --git a/README.md b/README.md index 232f2a7..1c00e13 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,18 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w - [`1.1.2-runtime-jessie`, `1.1.2-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/jessie/Dockerfile) - [`1.1.2-runtime-deps-jessie`, `1.1.2-runtime-deps`, `1.1-runtime-deps`, `1-runtime-deps` (*1.1/runtime-deps/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime-deps/jessie/Dockerfile) - [`1.1.2-sdk-jessie`, `1.1.2-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/jessie/Dockerfile) -- [`2.0.0-runtime-stretch`, `2.0.0-runtime`, `2.0-runtime`, `2-runtime`, `runtime` (*2.0/runtime/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/stretch/amd64/Dockerfile) -- [`2.0.0-runtime-jessie`, `2.0-runtime-jessie`, `2-runtime-jessie` (*2.0/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/jessie/amd64/Dockerfile) -- [`2.0.0-runtime-deps-stretch`, `2.0.0-runtime-deps`, `2.0-runtime-deps`, `2-runtime-deps`, `runtime-deps` (*2.0/runtime-deps/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/stretch/amd64/Dockerfile) -- [`2.0.0-runtime-deps-jessie`, `2.0-runtime-deps-jessie`, `2-runtime-deps-jessie` (*2.0/runtime-deps/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/jessie/amd64/Dockerfile) -- [`2.0.0-sdk-stretch`, `2.0.0-sdk`, `2.0-sdk`, `2-sdk`, `sdk`, `latest` (*2.0/sdk/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/stretch/amd64/Dockerfile) -- [`2.0.0-sdk-jessie`, `2.0-sdk-jessie`, `2-sdk-jessie` (*2.0/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/jessie/amd64/Dockerfile) +- [`2.0.0-runtime-stretch`, `2.0.0-runtime`, `2.0-runtime` (*2.0/runtime/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/stretch/amd64/Dockerfile) +- [`2.0.0-runtime-jessie`, `2.0-runtime-jessie` (*2.0/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/jessie/amd64/Dockerfile) +- [`2.0.0-runtime-deps-stretch`, `2.0.0-runtime-deps`, `2.0-runtime-deps` (*2.0/runtime-deps/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/stretch/amd64/Dockerfile) +- [`2.0.0-runtime-deps-jessie`, `2.0-runtime-deps-jessie` (*2.0/runtime-deps/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/jessie/amd64/Dockerfile) +- [`2.0.0-sdk-stretch`, `2.0.0-sdk`, `2.0-sdk` (*2.0/sdk/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/stretch/amd64/Dockerfile) +- [`2.0.0-sdk-jessie`, `2.0-sdk-jessie` (*2.0/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/jessie/amd64/Dockerfile) +- [`2.1.0-runtime-stretch`, `2.1.0-runtime`, `2.1-runtime`, `2-runtime`, `runtime` (*2.1/runtime/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/stretch/amd64/Dockerfile) +- [`2.1.0-runtime-jessie`, `2.1-runtime-jessie`, `2-runtime-jessie` (*2.1/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/jessie/amd64/Dockerfile) +- [`2.1.0-runtime-deps-stretch`, `2.1.0-runtime-deps`, `2.1-runtime-deps`, `2-runtime-deps`, `runtime-deps` (*2.1/runtime-deps/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime-deps/stretch/amd64/Dockerfile) +- [`2.1.0-runtime-deps-jessie`, `2.1-runtime-deps-jessie`, `2-runtime-deps-jessie` (*2.1/runtime-deps/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime-deps/jessie/amd64/Dockerfile) +- [`2.1.0-sdk-stretch`, `2.1.0-sdk`, `2.1-sdk`, `2-sdk`, `sdk`, `latest` (*2.1/sdk/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/stretch/amd64/Dockerfile) +- [`2.1.0-sdk-jessie`, `2.1-sdk-jessie`, `2-sdk-jessie` (*2.1/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/jessie/amd64/Dockerfile) # Supported Windows amd64 tags @@ -23,13 +29,17 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w - [`1.0.5-sdk-nanoserver`, `1.0.5-sdk`, `1.0-sdk` (*1.0/sdk/nanoserver/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/sdk/nanoserver/Dockerfile) - [`1.1.2-runtime-nanoserver`, `1.1.2-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/nanoserver/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/nanoserver/Dockerfile) - [`1.1.2-sdk-nanoserver`, `1.1.2-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/nanoserver/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/nanoserver/Dockerfile) -- [`2.0.0-runtime-nanoserver`, `2.0.0-runtime`, `2.0-runtime`, `2-runtime`, `runtime` (*2.0/runtime/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/nanoserver/amd64/Dockerfile) -- [`2.0.0-sdk-nanoserver`, `2.0.0-sdk`, `2.0-sdk`, `2-sdk`, `sdk`, `latest` (*2.0/sdk/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/nanoserver/amd64/Dockerfile) +- [`2.0.0-runtime-nanoserver`, `2.0.0-runtime`, `2.0-runtime` (*2.0/runtime/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/nanoserver/amd64/Dockerfile) +- [`2.0.0-sdk-nanoserver`, `2.0.0-sdk`, `2.0-sdk` (*2.0/sdk/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/nanoserver/amd64/Dockerfile) +- [`2.1.0-runtime-nanoserver`, `2.1.0-runtime`, `2.1-runtime`, `2-runtime`, `runtime` (*2.1/runtime/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/nanoserver/amd64/Dockerfile) +- [`2.1.0-sdk-nanoserver`, `2.1.0-sdk`, `2.1-sdk`, `2-sdk`, `sdk`, `latest` (*2.1/sdk/nanoserver/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/nanoserver/amd64/Dockerfile) # Supported Linux arm32 tags -- [`2.0.0-runtime-stretch-arm32v7`, `2.0.0-runtime`, `2.0-runtime`, `2-runtime`, `runtime` (*2.0/runtime/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/stretch/arm32v7/Dockerfile) -- [`2.0.0-runtime-deps-stretch-arm32v7`, `2.0.0-runtime-deps`, `2.0-runtime-deps`, `2-runtime-deps`, `runtime-deps` (*2.0/runtime-deps/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/stretch/arm32v7/Dockerfile) +- [`2.0.0-runtime-stretch-arm32v7`, `2.0.0-runtime`, `2.0-runtime` (*2.0/runtime/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/stretch/arm32v7/Dockerfile) +- [`2.0.0-runtime-deps-stretch-arm32v7`, `2.0.0-runtime-deps`, `2.0-runtime-deps` (*2.0/runtime-deps/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/stretch/arm32v7/Dockerfile) +- [`2.1.0-runtime-stretch-arm32v7`, `2.1.0-runtime`, `2.1-runtime`, `2-runtime`, `runtime` (*2.1/runtime/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/stretch/arm32v7/Dockerfile) +- [`2.1.0-runtime-deps-stretch-arm32v7`, `2.1.0-runtime-deps`, `2.1-runtime-deps`, `2-runtime-deps`, `runtime-deps` (*2.1/runtime-deps/stretch/arm32v7/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime-deps/stretch/arm32v7/Dockerfile) >**Note:** The Docker images in this repo are supported by Microsoft. The `arm32v7` images are in preview and have "best effort" support only by the community and .NET Core Team. diff --git a/build-pipeline/pipeline.json b/build-pipeline/pipeline.json index e2f2557..cdc21be 100644 --- a/build-pipeline/pipeline.json +++ b/build-pipeline/pipeline.json @@ -30,6 +30,12 @@ "Parameters": { "PB.image-builder.path": "2.0" } + }, + { + "Name": "dotnet-docker-linux-amd64-images", + "Parameters": { + "PB.image-builder.path": "2.1" + } } ] }, @@ -44,6 +50,12 @@ "Parameters": { "PB.image-builder.path": "2.0" } + }, + { + "Name": "dotnet-docker-linux-arm32v7-images", + "Parameters": { + "PB.image-builder.path": "2.1" + } } ] }, @@ -70,6 +82,12 @@ "Parameters": { "PB.image-builder.path": "2.0" } + }, + { + "Name": "dotnet-docker-windows-amd64-images", + "Parameters": { + "PB.image-builder.path": "2.1" + } } ] }, diff --git a/manifest.json b/manifest.json index e91a9c7..e53867a 100644 --- a/manifest.json +++ b/manifest.json @@ -255,9 +255,7 @@ "readmeOrder": 8, "sharedTags": { "2.0.0-runtime-deps": {}, - "2.0-runtime-deps": {}, - "2-runtime-deps": {}, - "runtime-deps": {} + "2.0-runtime-deps": {} }, "platforms": [ { @@ -288,9 +286,7 @@ "readmeOrder": 6, "sharedTags": { "2.0.0-runtime": {}, - "2.0-runtime": {}, - "2-runtime": {}, - "runtime": {} + "2.0-runtime": {} }, "platforms": [ { @@ -343,10 +339,7 @@ "readmeOrder": 10, "sharedTags": { "2.0.0-sdk": {}, - "2.0-sdk": {}, - "2-sdk": {}, - "sdk": {}, - "latest": {} + "2.0-sdk": {} }, "platforms": [ { @@ -388,8 +381,7 @@ "os": "linux", "tags": { "2.0.0-runtime-deps-jessie": {}, - "2.0-runtime-deps-jessie": {}, - "2-runtime-deps-jessie": {} + "2.0-runtime-deps-jessie": {} } } ] @@ -402,8 +394,7 @@ "os": "linux", "tags": { "2.0.0-runtime-jessie": {}, - "2.0-runtime-jessie": {}, - "2-runtime-jessie": {} + "2.0-runtime-jessie": {} } } ] @@ -416,7 +407,153 @@ "os": "linux", "tags": { "2.0.0-sdk-jessie": {}, - "2.0-sdk-jessie": {}, + "2.0-sdk-jessie": {} + } + } + ] + }, + { + "readmeOrder": 14, + "sharedTags": { + "2.1.0-runtime-deps": {}, + "2.1-runtime-deps": {}, + "2-runtime-deps": {}, + "runtime-deps": {} + }, + "platforms": [ + { + "dockerfile": "2.1/runtime-deps/stretch/amd64", + "os": "linux", + "tags": { + "2.1.0-runtime-deps-stretch": {} + } + }, + { + "architecture": "arm", + "dockerfile": "2.1/runtime-deps/stretch/arm32v7", + "os": "linux", + "tags": { + "2.1.0-runtime-deps-stretch-arm32v7": {}, + "2.1-runtime-deps-stretch-arm32v7": { + "isUndocumented": true + }, + "2-runtime-deps-stretch-arm32v7": { + "isUndocumented": true + } + }, + "variant": "armv7" + } + ] + }, + { + "readmeOrder": 12, + "sharedTags": { + "2.1.0-runtime": {}, + "2.1-runtime": {}, + "2-runtime": {}, + "runtime": {} + }, + "platforms": [ + { + "dockerfile": "2.1/runtime/stretch/amd64", + "os": "linux", + "tags": { + "2.1.0-runtime-stretch": {} + } + }, + { + "architecture": "arm", + "dockerfile": "2.1/runtime/stretch/arm32v7", + "os": "linux", + "tags": { + "2.1.0-runtime-stretch-arm32v7": {}, + "2.1-runtime-stretch-arm32v7": { + "isUndocumented": true + }, + "2-runtime-stretch-arm32v7": { + "isUndocumented": true + } + }, + "variant": "armv7" + }, + { + "dockerfile": "2.1/runtime/nanoserver/amd64", + "os": "windows", + "tags": { + "2.1.0-runtime-nanoserver": {}, + "2.1.0-runtime-nanoserver-$(nanoServerVersion)": { + "isUndocumented": true + } + } + } + ] + }, + { + "readmeOrder": 16, + "sharedTags": { + "2.1.0-sdk": {}, + "2.1-sdk": {}, + "2-sdk": {}, + "sdk": {}, + "latest": {} + }, + "platforms": [ + { + "dockerfile": "2.1/sdk/stretch/amd64", + "os": "linux", + "tags": { + "2.1.0-sdk-stretch": {} + } + }, + { + "dockerfile": "2.1/sdk/nanoserver/amd64", + "os": "windows", + "tags": { + "2.1.0-sdk-nanoserver": {}, + "2.1.0-sdk-nanoserver-$(nanoServerVersion)": { + "isUndocumented": true + } + } + } + ] + }, + { + "readmeOrder": 15, + "platforms": [ + { + "dockerfile": "2.1/runtime-deps/jessie/amd64", + "os": "linux", + "tags": { + "2.1.0-runtime-deps-jessie": {}, + "2.1-runtime-deps-jessie": {}, + "2-runtime-deps-jessie": {} + } + } + ] + }, + { + "readmeOrder": 13, + "platforms": [ + { + "dockerfile": "2.1/runtime/jessie/amd64", + "os": "linux", + "tags": { + "2.1.0-runtime-jessie": {}, + "2.1-runtime-jessie": {}, + "2-runtime-jessie": {} + } + } + ] + }, + { + "readmeOrder": 17, + "platforms": [ + { + "dockerfile": "2.1/sdk/jessie/amd64", + "os": "linux", + "tags": { + "2.1.0-sdk-jessie": {}, + "2.1-sdk-jessie": {}, "2-sdk-jessie": {} } } diff --git a/netci.groovy b/netci.groovy index 1a2206a..1749a21 100644 --- a/netci.groovy +++ b/netci.groovy @@ -4,7 +4,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true def platformList = ['Ubuntu16.04:Debian', 'Windows_2016:NanoServer'] -def versionList = ['1.0', '1.1', '2.0'] +def versionList = ['1.0', '1.1', '2.0', '2.1'] platformList.each { platform -> def(hostOS, containerOS) = platform.tokenize(':') diff --git a/test/run-test.ps1 b/test/run-test.ps1 index 3434ac5..0edc200 100644 --- a/test/run-test.ps1 +++ b/test/run-test.ps1 @@ -45,7 +45,7 @@ $testFilesPath = "$PSScriptRoot$dirSeparator" $activeOS = docker version -f "{{ .Server.Os }}" # update as appropriate (e.g. "2.0-sdk") whenever pre-release packages are referenced prior to being available on NuGet.org. -$includePrereleasePackageSourceForSdkTag = "2.0*-sdk*" +$includePrereleasePackageSourceForSdkTag = "2.1*-sdk*" if ($activeOS -eq "windows") { $containerRoot = "C:\" @@ -67,7 +67,15 @@ Get-ActivePlatformImages $manifestRepo $activeOS | $timeStamp = Get-Date -Format FileDateTime $appName = "app$timeStamp".ToLower() $buildImage = "sdk-build-$appName" - $dotnetNewParam = "console --framework netcoreapp$($sdkTag.Split('-')[0].Substring(0,3))" + + $netcoreappVersion = $sdkTag.Split('-')[0].Substring(0,3) + if ($sdkTag -like "2.1*-sdk*") + { + # TODO: Remove once 2.1 SDK templates support netcoreapp2.1 + $netcoreappVersion="2.0" + } + + $dotnetNewParam = "console --framework netcoreapp$netcoreappVersion" $optionalRestoreParams = "" if ($sdkTag -like $includePrereleasePackageSourceForSdkTag) {