From f66de50808ddb0e3fee136a6afe9a3a2a5c6bc43 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 9 Jun 2020 19:47:23 +0000 Subject: [PATCH 1/2] Update .NET Core Docker containers Docker tags --- src/Promitor.Agents.ResourceDiscovery/Dockerfile | 4 ++-- src/Promitor.Agents.Scraper/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile b/src/Promitor.Agents.ResourceDiscovery/Dockerfile index e1366267e..b4bd5fe83 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile @@ -1,11 +1,11 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.300 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.301 AS build WORKDIR /src COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/ COPY Promitor.Agents.Core/* Promitor.Agents.Core/ COPY Promitor.Core/* Promitor.Core/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.5 AS runtime WORKDIR /app ARG CONFIG_FOLDER="/config/" ENV PROMITOR_INTERNAL_CONFIG_FOLDER=$CONFIG_FOLDER diff --git a/src/Promitor.Agents.Scraper/Dockerfile b/src/Promitor.Agents.Scraper/Dockerfile index b3afb2e56..c19c8fb41 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile +++ b/src/Promitor.Agents.Scraper/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.300 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.301 AS build WORKDIR /src COPY Promitor.Core/* Promitor.Core/ COPY Promitor.Agents.Core/* Promitor.Agents.Core/ @@ -11,7 +11,7 @@ COPY Promitor.Integrations.Sinks.Prometheus/* Promitor.Integrations.Sinks.Promet COPY Promitor.Agents.Scraper/* Promitor.Agents.Scraper/ RUN dotnet publish Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj --configuration release --output app -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4 as runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.5 as runtime WORKDIR /app ARG CONFIG_FOLDER="/config/" ENV PROMITOR_INTERNAL_CONFIG_FOLDER=$CONFIG_FOLDER From 83d421a345ee642454f4b95aff214035585db661 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Wed, 10 Jun 2020 07:31:48 +0200 Subject: [PATCH 2/2] Align DotNet.Sdk.Version --- build/azure-devops/variables/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-devops/variables/build.yml b/build/azure-devops/variables/build.yml index 778c4ceaa..0a44358af 100644 --- a/build/azure-devops/variables/build.yml +++ b/build/azure-devops/variables/build.yml @@ -1,3 +1,3 @@ variables: - DotNet.Sdk.Version: '3.1.300' + DotNet.Sdk.Version: '3.1.301' DotNet.Configuration: 'release'