From cecc380c548f99a4164155fb851a2cbee144c312 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Thu, 14 Jan 2021 11:04:46 -0800 Subject: [PATCH 1/3] Updating UbuntuNetCoreKeyring dockerfile to use net core 5 --- eng/containers/UbuntuNetCoreKeyring/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/containers/UbuntuNetCoreKeyring/Dockerfile b/eng/containers/UbuntuNetCoreKeyring/Dockerfile index 9f09f0bcb2b7..ae47d5b2bb6b 100644 --- a/eng/containers/UbuntuNetCoreKeyring/Dockerfile +++ b/eng/containers/UbuntuNetCoreKeyring/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ENV \ NO_AT_BRIDGE=1 \ From 37cc1cea913cbcad7791ecb7f50730b8bf03296a Mon Sep 17 00:00:00 2001 From: Ben Broderick Phillips Date: Thu, 14 Jan 2021 14:18:24 -0500 Subject: [PATCH 2/3] Update ubuntu netcore keyring dockerfile to use net 5 --- eng/containers/UbuntuNetCoreKeyring/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/containers/UbuntuNetCoreKeyring/Dockerfile b/eng/containers/UbuntuNetCoreKeyring/Dockerfile index 9f09f0bcb2b7..ea1d0ea7d943 100644 --- a/eng/containers/UbuntuNetCoreKeyring/Dockerfile +++ b/eng/containers/UbuntuNetCoreKeyring/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build ENV \ NO_AT_BRIDGE=1 \ DOCKER_CONTAINER_NAME="ubuntu_netcore_keyring" \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \ - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Ubuntu-18.04 + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Ubuntu-20.04 # Install GNOME keyring RUN apt-get update \ @@ -14,10 +14,10 @@ RUN apt-get update \ gnome-keyring # Install PowerShell && .net core runtime 2.1 -RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb \ +RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update \ && apt-get install -y powershell \ && pwsh --version \ && apt-get install -y dotnet-runtime-2.1 \ - && dotnet --list-runtimes \ No newline at end of file + && dotnet --list-runtimes From c279c9ef3014e98167cb737a4805366737a8071c Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 15 Jan 2021 12:18:01 -0800 Subject: [PATCH 3/3] adding python to installed packages --- eng/containers/UbuntuNetCoreKeyring/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/containers/UbuntuNetCoreKeyring/Dockerfile b/eng/containers/UbuntuNetCoreKeyring/Dockerfile index ae47d5b2bb6b..cff0ff23bd60 100644 --- a/eng/containers/UbuntuNetCoreKeyring/Dockerfile +++ b/eng/containers/UbuntuNetCoreKeyring/Dockerfile @@ -11,7 +11,8 @@ RUN apt-get update \ && apt-get install -y \ libsecret-1-dev \ dbus-x11 \ - gnome-keyring + gnome-keyring \ + python # Install PowerShell && .net core runtime 2.1 RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb \