From e383700cef990dcc84d374c247974582fd27bb32 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 3 Nov 2017 16:51:30 -0500 Subject: [PATCH 1/9] Add 2.1 Alpine images --- 2.1/runtime-deps/alpine/amd64/Dockerfile | 18 ++++++++++ 2.1/runtime/alpine/amd64/Dockerfile | 16 +++++++++ README.md | 2 ++ manifest.json | 30 ++++++++++++++-- .../ImageTests.cs | 34 ++++++++++++++----- 5 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 2.1/runtime-deps/alpine/amd64/Dockerfile create mode 100644 2.1/runtime/alpine/amd64/Dockerfile diff --git a/2.1/runtime-deps/alpine/amd64/Dockerfile b/2.1/runtime-deps/alpine/amd64/Dockerfile new file mode 100644 index 0000000..b8f6109 --- /dev/null +++ b/2.1/runtime-deps/alpine/amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM alpine:3.6 + +RUN apk update \ + && apk add --no-cache \ + ca-certificates \ + \ + # .NET Core dependencies + icu-libs \ + krb5-libs \ + libcurl \ + libintl \ + libssl1.0 \ + libunwind \ + libuuid \ + userspace-rcu \ + zlib \ + && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \ + lttng-ust diff --git a/2.1/runtime/alpine/amd64/Dockerfile b/2.1/runtime/alpine/amd64/Dockerfile new file mode 100644 index 0000000..ce5b377 --- /dev/null +++ b/2.1/runtime/alpine/amd64/Dockerfile @@ -0,0 +1,16 @@ +FROM microsoft/dotnet-nightly:2.1-runtime-deps-alpine + +# Install .NET Core +ENV DOTNET_VERSION 2.1.0-preview1-25901-02 +ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-alpine.3.6-x64.tar.gz +ENV DOTNET_DOWNLOAD_SHA 2c7ff8a63c03354b6c3f563f662e8820108be7995b2d72db7d5446ad579977a37db46bae7c5de918b4423a1c37bcfd505df514248f253be1ed2d9a84a982aa98 + +RUN apk add --no-cache --virtual .build-deps \ + openssl \ + && wget -O dotnet.tar.gz $DOTNET_DOWNLOAD_URL \ + && echo "$DOTNET_DOWNLOAD_SHA 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 \ + && apk del .build-deps diff --git a/README.md b/README.md index 14800be..bf96b4a 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w - [`2.0.1-sdk-2.0.3-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.1.0-preview1-runtime-stretch`, `2.1-runtime-stretch`, `2.1.0-preview1-runtime`, `2.1-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-preview1-runtime-jessie`, `2.1-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-preview1-runtime-alpine`, `2.1-runtime-alpine` (*2.1/runtime/alpine/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/alpine/amd64/Dockerfile) +- [`2.1.0-preview1-runtime-deps-alpine`, `2.1-runtime-deps-alpine` (*2.1/runtime-deps/alpine/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime-deps/alpine/amd64/Dockerfile) - [`2.1.0-preview1-sdk-stretch`, `2.1-sdk-stretch`, `2.1.0-preview1-sdk`, `2.1-sdk` (*2.1/sdk/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/stretch/amd64/Dockerfile) - [`2.1.0-preview1-sdk-jessie`, `2.1-sdk-jessie` (*2.1/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/jessie/amd64/Dockerfile) diff --git a/manifest.json b/manifest.json index 4029738..996f3ca 100644 --- a/manifest.json +++ b/manifest.json @@ -399,7 +399,7 @@ ] }, { - "readmeOrder": 12, + "readmeOrder": 14, "sharedTags": { "2.1.0-preview1-sdk": {}, "2.1-sdk": {} @@ -446,7 +446,7 @@ ] }, { - "readmeOrder": 13, + "readmeOrder": 15, "platforms": [ { "dockerfile": "2.1/sdk/jessie/amd64", @@ -457,6 +457,32 @@ } } ] + }, + { + "readmeOrder": 13, + "platforms": [ + { + "dockerfile": "2.1/runtime-deps/alpine/amd64", + "os": "linux", + "tags": { + "2.1.0-preview1-runtime-deps-alpine": {}, + "2.1-runtime-deps-alpine": {} + } + } + ] + }, + { + "readmeOrder": 12, + "platforms": [ + { + "dockerfile": "2.1/runtime/alpine/amd64", + "os": "linux", + "tags": { + "2.1.0-preview1-runtime-alpine": {}, + "2.1-runtime-alpine": {} + } + } + ] } ] } diff --git a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs index 331d58a..469091f 100644 --- a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs +++ b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs @@ -44,12 +44,8 @@ public static IEnumerable GetVerifyImagesData() Architecture = "arm" }, new ImageDescriptor { DotNetCoreVersion = "2.1", RuntimeDepsVersion = "2.0" }, - new ImageDescriptor - { - DotNetCoreVersion = "2.1", - RuntimeDepsVersion = "2.0", - OsVariant = "jessie" - }, + new ImageDescriptor { DotNetCoreVersion = "2.1", RuntimeDepsVersion = "2.0", OsVariant = "jessie" }, + new ImageDescriptor { DotNetCoreVersion = "2.1", OsVariant = "alpine", SdkOsVariant = "", }, new ImageDescriptor { DotNetCoreVersion = "2.1", @@ -117,14 +113,15 @@ public void VerifyImages(ImageDescriptor imageDescriptor) { CreateTestAppWithSdkImage(imageDescriptor, appSdkImage); - if (!imageDescriptor.IsArm) + if (!string.IsNullOrEmpty(imageDescriptor.SdkOsVariant)) { VerifySdkImage_RunApp(imageDescriptor, appSdkImage); } VerifyRuntimeImage_FrameworkDependentApp(imageDescriptor, appSdkImage); - if (DockerHelper.IsLinuxContainerModeEnabled) + if (DockerHelper.IsLinuxContainerModeEnabled + && !string.Equals(imageDescriptor.OsVariant, "alpine", StringComparison.OrdinalIgnoreCase)) { VerifyRuntimeDepsImage_SelfContainedApp(imageDescriptor, appSdkImage); } @@ -199,7 +196,7 @@ private void VerifyRuntimeImage_FrameworkDependentApp(ImageDescriptor imageDescr private void VerifyRuntimeDepsImage_SelfContainedApp(ImageDescriptor imageDescriptor, string appSdkImage) { string selfContainedAppId = GetIdentifier(imageDescriptor.DotNetCoreVersion, "self-contained-app"); - string rid = imageDescriptor.IsArm ? "linux-arm" : "debian.8-x64"; + string rid = GetRid(imageDescriptor); try { @@ -269,5 +266,24 @@ private static string GetIdentifier(string version, string type) { return $"{version}-{type}-{DateTime.Now.ToFileTime()}"; } + + private static string GetRid(ImageDescriptor imageDescriptor) + { + string rid; + if (imageDescriptor.IsArm) + { + rid = "linux-arm"; + } + else if (string.Equals(imageDescriptor.OsVariant, "alpine", StringComparison.OrdinalIgnoreCase)) + { + rid = "alpine.3.6-x64"; + } + else + { + rid = "debian.8-x64"; + } + + return rid; + } } } From 80aee3a0f85b6b174d42f571eef5cf913eb4d2a2 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 6 Nov 2017 21:23:29 -0600 Subject: [PATCH 2/9] Changes per code review --- test/Microsoft.DotNet.Docker.Tests/ImageDescriptor.cs | 1 + test/Microsoft.DotNet.Docker.Tests/ImageTests.cs | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.DotNet.Docker.Tests/ImageDescriptor.cs b/test/Microsoft.DotNet.Docker.Tests/ImageDescriptor.cs index 8b7c788..b1496f5 100644 --- a/test/Microsoft.DotNet.Docker.Tests/ImageDescriptor.cs +++ b/test/Microsoft.DotNet.Docker.Tests/ImageDescriptor.cs @@ -14,6 +14,7 @@ public class ImageDescriptor public string Architecture { get; set; } = "amd64"; public string DotNetCoreVersion { get; set; } + public bool IsAlpine { get => String.Equals("alpine", OsVariant, StringComparison.OrdinalIgnoreCase); } public bool IsArm { get => String.Equals("arm", Architecture, StringComparison.OrdinalIgnoreCase); } public string OsVariant { get; set; } public string PlatformOS { get; set; } diff --git a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs index 469091f..763041f 100644 --- a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs +++ b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs @@ -120,8 +120,7 @@ public void VerifyImages(ImageDescriptor imageDescriptor) VerifyRuntimeImage_FrameworkDependentApp(imageDescriptor, appSdkImage); - if (DockerHelper.IsLinuxContainerModeEnabled - && !string.Equals(imageDescriptor.OsVariant, "alpine", StringComparison.OrdinalIgnoreCase)) + if (DockerHelper.IsLinuxContainerModeEnabled && !imageDescriptor.IsAlpine) { VerifyRuntimeDepsImage_SelfContainedApp(imageDescriptor, appSdkImage); } @@ -274,7 +273,7 @@ private static string GetRid(ImageDescriptor imageDescriptor) { rid = "linux-arm"; } - else if (string.Equals(imageDescriptor.OsVariant, "alpine", StringComparison.OrdinalIgnoreCase)) + else if (imageDescriptor.IsAlpine) { rid = "alpine.3.6-x64"; } From 9e9f3d2666fc1a82578dc1e02976535bcaeade1e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 7 Nov 2017 14:33:33 -0600 Subject: [PATCH 3/9] Update to latest runtime version which supports self-contained apps --- 2.1/runtime/alpine/amd64/Dockerfile | 4 ++-- test/Microsoft.DotNet.Docker.Tests/ImageTests.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/2.1/runtime/alpine/amd64/Dockerfile b/2.1/runtime/alpine/amd64/Dockerfile index ce5b377..6864189 100644 --- a/2.1/runtime/alpine/amd64/Dockerfile +++ b/2.1/runtime/alpine/amd64/Dockerfile @@ -1,9 +1,9 @@ FROM microsoft/dotnet-nightly:2.1-runtime-deps-alpine # Install .NET Core -ENV DOTNET_VERSION 2.1.0-preview1-25901-02 +ENV DOTNET_VERSION 2.1.0-preview1-25907-01 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-alpine.3.6-x64.tar.gz -ENV DOTNET_DOWNLOAD_SHA 2c7ff8a63c03354b6c3f563f662e8820108be7995b2d72db7d5446ad579977a37db46bae7c5de918b4423a1c37bcfd505df514248f253be1ed2d9a84a982aa98 +ENV DOTNET_DOWNLOAD_SHA 52aa6a93ba7371b4e0c1309d8b79614fc13c670caebb9f1d90c7cae66c4fd6b9c142e723280ce43a748c6450e1ce41c9d47c62d2d1fb0d21855f4916745b9fe9 RUN apk add --no-cache --virtual .build-deps \ openssl \ diff --git a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs index 763041f..4c1001c 100644 --- a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs +++ b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs @@ -120,7 +120,7 @@ public void VerifyImages(ImageDescriptor imageDescriptor) VerifyRuntimeImage_FrameworkDependentApp(imageDescriptor, appSdkImage); - if (DockerHelper.IsLinuxContainerModeEnabled && !imageDescriptor.IsAlpine) + if (DockerHelper.IsLinuxContainerModeEnabled) { VerifyRuntimeDepsImage_SelfContainedApp(imageDescriptor, appSdkImage); } @@ -144,8 +144,10 @@ private void CreateTestAppWithSdkImage(ImageDescriptor imageDescriptor, string a string sdkImage = GetDotNetImage( imageDescriptor.SdkVersion, DotNetImageType.SDK, imageDescriptor.SdkOsVariant); + // TODO: Remove Alpine specialization once SDK is updated to depend on a Runtime version with Alpine support + string dockerfileOS = imageDescriptor.IsAlpine ? imageDescriptor.OsVariant : DockerHelper.DockerOS.ToLower(); DockerHelper.Build( - dockerfile: $"Dockerfile.{DockerHelper.DockerOS.ToLower()}.testapp", + dockerfile: $"Dockerfile.{dockerfileOS}.testapp", tag: appSdkImage, fromImage: sdkImage, buildArgs: buildArgs.ToArray()); From 14a0739bfc555a1a6d1e4137cb2ad5a4b699bc7e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 7 Nov 2017 14:45:02 -0600 Subject: [PATCH 4/9] Added missing file from previous checkin --- .../Dockerfile.alpine.testapp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp diff --git a/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp b/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp new file mode 100644 index 0000000..775d9b3 --- /dev/null +++ b/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp @@ -0,0 +1,11 @@ +ARG base_image +FROM $base_image + +ARG netcoreapp_version +ARG optional_new_args + +WORKDIR testApp +RUN dotnet new console --framework netcoreapp$netcoreapp_version $optional_new_args +RUN sed -i 's/2.1.0-preview1-25825-07/2.1.0-preview1-25907-01/g' testApp.csproj +RUN dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json -s https://api.nuget.org/v3/index.json +RUN dotnet build From b953ee531bc8ac3f07aea6503169cc29a4e8eb6b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 8 Nov 2017 08:59:06 -0600 Subject: [PATCH 5/9] Remove workarounds for out of data SDK --- .../Dockerfile.alpine.testapp | 11 ----------- test/Microsoft.DotNet.Docker.Tests/ImageTests.cs | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp diff --git a/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp b/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp deleted file mode 100644 index 775d9b3..0000000 --- a/test/Microsoft.DotNet.Docker.Tests/Dockerfile.alpine.testapp +++ /dev/null @@ -1,11 +0,0 @@ -ARG base_image -FROM $base_image - -ARG netcoreapp_version -ARG optional_new_args - -WORKDIR testApp -RUN dotnet new console --framework netcoreapp$netcoreapp_version $optional_new_args -RUN sed -i 's/2.1.0-preview1-25825-07/2.1.0-preview1-25907-01/g' testApp.csproj -RUN dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json -s https://api.nuget.org/v3/index.json -RUN dotnet build diff --git a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs index 4c1001c..55017c1 100644 --- a/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs +++ b/test/Microsoft.DotNet.Docker.Tests/ImageTests.cs @@ -144,10 +144,8 @@ private void CreateTestAppWithSdkImage(ImageDescriptor imageDescriptor, string a string sdkImage = GetDotNetImage( imageDescriptor.SdkVersion, DotNetImageType.SDK, imageDescriptor.SdkOsVariant); - // TODO: Remove Alpine specialization once SDK is updated to depend on a Runtime version with Alpine support - string dockerfileOS = imageDescriptor.IsAlpine ? imageDescriptor.OsVariant : DockerHelper.DockerOS.ToLower(); DockerHelper.Build( - dockerfile: $"Dockerfile.{dockerfileOS}.testapp", + dockerfile: $"Dockerfile.{DockerHelper.DockerOS.ToLower()}.testapp", tag: appSdkImage, fromImage: sdkImage, buildArgs: buildArgs.ToArray()); From 5332f9bc5d501b00a57f1fe35fab8e652a88b326 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 8 Nov 2017 11:55:43 -0600 Subject: [PATCH 6/9] Update to lastest runtime --- 2.1/runtime/alpine/amd64/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.1/runtime/alpine/amd64/Dockerfile b/2.1/runtime/alpine/amd64/Dockerfile index 6864189..d5f9fd2 100644 --- a/2.1/runtime/alpine/amd64/Dockerfile +++ b/2.1/runtime/alpine/amd64/Dockerfile @@ -1,9 +1,9 @@ FROM microsoft/dotnet-nightly:2.1-runtime-deps-alpine # Install .NET Core -ENV DOTNET_VERSION 2.1.0-preview1-25907-01 +ENV DOTNET_VERSION 2.1.0-preview1-25907-02 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-alpine.3.6-x64.tar.gz -ENV DOTNET_DOWNLOAD_SHA 52aa6a93ba7371b4e0c1309d8b79614fc13c670caebb9f1d90c7cae66c4fd6b9c142e723280ce43a748c6450e1ce41c9d47c62d2d1fb0d21855f4916745b9fe9 +ENV DOTNET_DOWNLOAD_SHA e062357d057a2251abf3122ac32d95ef68043283036c34f61259358c2753eb82f6bc04660342d812fa2f8b5fafe35806ee032d04e2c00be3e1cf9c68c18d9c83 RUN apk add --no-cache --virtual .build-deps \ openssl \ From a4ec0f3d392d3aaef1a72562e1e1566f156d0848 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 14 Nov 2017 12:56:18 -0600 Subject: [PATCH 7/9] Add missing tzdata package to runtime-deps --- 2.1/runtime-deps/alpine/amd64/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.1/runtime-deps/alpine/amd64/Dockerfile b/2.1/runtime-deps/alpine/amd64/Dockerfile index b8f6109..a96c364 100644 --- a/2.1/runtime-deps/alpine/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine/amd64/Dockerfile @@ -1,7 +1,6 @@ FROM alpine:3.6 -RUN apk update \ - && apk add --no-cache \ +RUN apk add --no-cache \ ca-certificates \ \ # .NET Core dependencies @@ -12,6 +11,7 @@ RUN apk update \ libssl1.0 \ libunwind \ libuuid \ + tzdata \ userspace-rcu \ zlib \ && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \ From 92754cbdb6f6a76e2cad1d4779f959d54c0b688a Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 20 Nov 2017 16:21:08 -0600 Subject: [PATCH 8/9] Remove icu-libs and toggle invariant globalization mode --- 2.1/runtime-deps/alpine/amd64/Dockerfile | 6 +++++- 2.1/runtime/alpine/amd64/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/2.1/runtime-deps/alpine/amd64/Dockerfile b/2.1/runtime-deps/alpine/amd64/Dockerfile index a96c364..228f3cc 100644 --- a/2.1/runtime-deps/alpine/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine/amd64/Dockerfile @@ -4,11 +4,12 @@ RUN apk add --no-cache \ ca-certificates \ \ # .NET Core dependencies - icu-libs \ krb5-libs \ libcurl \ + libgcc \ libintl \ libssl1.0 \ + libstdc++ \ libunwind \ libuuid \ tzdata \ @@ -16,3 +17,6 @@ RUN apk add --no-cache \ zlib \ && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \ lttng-ust + +# Set the invariant mode since icu_libs isn't included (see https://github.com/dotnet/announcements/issues/20) +ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT true diff --git a/2.1/runtime/alpine/amd64/Dockerfile b/2.1/runtime/alpine/amd64/Dockerfile index d5f9fd2..03164dc 100644 --- a/2.1/runtime/alpine/amd64/Dockerfile +++ b/2.1/runtime/alpine/amd64/Dockerfile @@ -1,9 +1,9 @@ FROM microsoft/dotnet-nightly:2.1-runtime-deps-alpine # Install .NET Core -ENV DOTNET_VERSION 2.1.0-preview1-25907-02 +ENV DOTNET_VERSION 2.1.0-preview1-25919-02 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-alpine.3.6-x64.tar.gz -ENV DOTNET_DOWNLOAD_SHA e062357d057a2251abf3122ac32d95ef68043283036c34f61259358c2753eb82f6bc04660342d812fa2f8b5fafe35806ee032d04e2c00be3e1cf9c68c18d9c83 +ENV DOTNET_DOWNLOAD_SHA 7a8b081c890226ba7220c654dc833752f837171c2fe449367d24c2980db3a809012478a67423fd46264e5d2f0389a6890077f8dd25a1fc4aeecb25deb84d72a4 RUN apk add --no-cache --virtual .build-deps \ openssl \ From 66b8d22d59164bce93e71dda18799068881dd64e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Mon, 20 Nov 2017 16:32:13 -0600 Subject: [PATCH 9/9] Tweak readme order --- README.md | 2 +- manifest.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0cb7135..ea94149 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w - [`2.0.3-sdk-stretch`, `2.0-sdk-stretch`, `2.0.3-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.3-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.1.0-preview1-runtime-stretch`, `2.1-runtime-stretch`, `2.1.0-preview1-runtime`, `2.1-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-preview1-runtime-jessie`, `2.1-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-preview1-runtime-alpine`, `2.1-runtime-alpine` (*2.1/runtime/alpine/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/alpine/amd64/Dockerfile) +- [`2.1.0-preview1-runtime-jessie`, `2.1-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-preview1-runtime-deps-alpine`, `2.1-runtime-deps-alpine` (*2.1/runtime-deps/alpine/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime-deps/alpine/amd64/Dockerfile) - [`2.1.0-preview1-sdk-stretch`, `2.1-sdk-stretch`, `2.1.0-preview1-sdk`, `2.1-sdk` (*2.1/sdk/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/stretch/amd64/Dockerfile) - [`2.1.0-preview1-sdk-jessie`, `2.1-sdk-jessie` (*2.1/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/sdk/jessie/amd64/Dockerfile) diff --git a/manifest.json b/manifest.json index 4fc27a5..44b9e62 100644 --- a/manifest.json +++ b/manifest.json @@ -403,7 +403,7 @@ ] }, { - "readmeOrder": 11, + "readmeOrder": 12, "platforms": [ { "dockerfile": "2.1/runtime/jessie/amd64", @@ -442,7 +442,7 @@ ] }, { - "readmeOrder": 12, + "readmeOrder": 11, "platforms": [ { "dockerfile": "2.1/runtime/alpine/amd64",