From 14a430d60eb32a31961b1b689483717464162642 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 8 Jun 2021 16:58:31 +0000 Subject: [PATCH 1/3] chore(deps): update .net core docker containers docker tags --- src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux | 4 ++-- src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows | 4 ++-- src/Promitor.Agents.Scraper/Dockerfile.linux | 4 ++-- src/Promitor.Agents.Scraper/Dockerfile.windows | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux index a25c071ca..3991c7187 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.409-alpine3.12 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.410-alpine3.12 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/ @@ -8,7 +8,7 @@ COPY Promitor.Core/* Promitor.Core/ COPY Promitor.Integrations.Azure/* Promitor.Integrations.Azure/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=$VERSION -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.15-alpine3.12 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.16-alpine3.12 AS runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="/config/" COPY --from=build /app . diff --git a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows index 33825bdcf..76d41065d 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows +++ b/src/Promitor.Agents.ResourceDiscovery/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.409 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.410 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Agents.ResourceDiscovery/* Promitor.Agents.ResourceDiscovery/ @@ -8,7 +8,7 @@ COPY Promitor.Core/* Promitor.Core/ COPY Promitor.Integrations.Azure/* Promitor.Integrations.Azure/ RUN dotnet publish Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj --configuration release --output /app /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.15 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.16 AS runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" COPY --from=build /app . diff --git a/src/Promitor.Agents.Scraper/Dockerfile.linux b/src/Promitor.Agents.Scraper/Dockerfile.linux index 79d6215b3..2d857d4f4 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.linux +++ b/src/Promitor.Agents.Scraper/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.409-alpine3.12 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.410-alpine3.12 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Core/* Promitor.Core/ @@ -15,7 +15,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 /p:Version=$VERSION -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.15-alpine3.12 as runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.16-alpine3.12 as runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="/config/" diff --git a/src/Promitor.Agents.Scraper/Dockerfile.windows b/src/Promitor.Agents.Scraper/Dockerfile.windows index ffd2f32cd..b0aa844eb 100644 --- a/src/Promitor.Agents.Scraper/Dockerfile.windows +++ b/src/Promitor.Agents.Scraper/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.409 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.410 AS build WORKDIR /src ARG VERSION="UNSET-VERSION" COPY Promitor.Core/* Promitor.Core/ @@ -15,7 +15,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 /p:Version=%VERSION% -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.15 as runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.16 as runtime WORKDIR /app ENV PROMITOR_CONFIG_FOLDER="c:/config/" From 4d9a613611a9317f8d93956732d26c2088d5bf9d Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Wed, 9 Jun 2021 05:04:24 +0000 Subject: [PATCH 2/3] Bump all versions Signed-off-by: GitHub --- src/Promitor.Agents.Core/Promitor.Agents.Core.csproj | 2 +- .../Promitor.Agents.ResourceDiscovery.csproj | 2 +- src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj | 2 +- src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj | 2 +- src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj | 2 +- src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj | 2 +- src/Promitor.Core/Promitor.Core.csproj | 2 +- .../Promitor.Integrations.Azure.csproj | 2 +- .../Promitor.Integrations.AzureMonitor.csproj | 2 +- .../Promitor.Integrations.AzureStorage.csproj | 2 +- .../Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj | 2 +- .../Promitor.Integrations.Sinks.Prometheus.csproj | 2 +- .../Promitor.Integrations.Sinks.Statsd.csproj | 2 +- .../Promitor.Tests.Integration.csproj | 2 +- src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj index 911d2019d..d320de865 100644 --- a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj +++ b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj b/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj index f33387609..777acdd82 100644 --- a/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj +++ b/src/Promitor.Agents.ResourceDiscovery/Promitor.Agents.ResourceDiscovery.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 ..\docker-compose.dcproj - 3.1.15 + 3.1.16 true Docs\Open-Api.xml 159d036b-3697-40d4-bdc4-7d9736521375 diff --git a/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj b/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj index d11b3df55..d5b518cb2 100644 --- a/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj +++ b/src/Promitor.Agents.Scraper/Promitor.Agents.Scraper.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 ..\docker-compose.dcproj - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj b/src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj index 7991b1bb4..73957a7dc 100644 --- a/src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj +++ b/src/Promitor.Core.Contracts/Promitor.Core.Contracts.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj b/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj index a31c39255..a09d797ab 100644 --- a/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj +++ b/src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 8 diff --git a/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj b/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj index a04d5f212..efddec8a6 100644 --- a/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj +++ b/src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Core/Promitor.Core.csproj b/src/Promitor.Core/Promitor.Core.csproj index bdbc2f1cb..4e8a357f7 100644 --- a/src/Promitor.Core/Promitor.Core.csproj +++ b/src/Promitor.Core/Promitor.Core.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj b/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj index eb141864b..21ca7b11d 100644 --- a/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj +++ b/src/Promitor.Integrations.Azure/Promitor.Integrations.Azure.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj b/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj index 1eba6dd13..571ff669e 100644 --- a/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj +++ b/src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj b/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj index c591c4175..e351690ca 100644 --- a/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj +++ b/src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj b/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj index f9b0cefe9..b590e9d1c 100644 --- a/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj +++ b/src/Promitor.Integrations.Sinks.Atlassian.Statuspage/Promitor.Integrations.Sinks.Atlassian.Statuspage.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj b/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj index 5af06d494..92a3122f1 100644 --- a/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj +++ b/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Integrations.Sinks.Statsd/Promitor.Integrations.Sinks.Statsd.csproj b/src/Promitor.Integrations.Sinks.Statsd/Promitor.Integrations.Sinks.Statsd.csproj index 1f84afdac..75179dd0f 100644 --- a/src/Promitor.Integrations.Sinks.Statsd/Promitor.Integrations.Sinks.Statsd.csproj +++ b/src/Promitor.Integrations.Sinks.Statsd/Promitor.Integrations.Sinks.Statsd.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 diff --git a/src/Promitor.Tests.Integration/Promitor.Tests.Integration.csproj b/src/Promitor.Tests.Integration/Promitor.Tests.Integration.csproj index 5ce27bf61..0110f5b0f 100644 --- a/src/Promitor.Tests.Integration/Promitor.Tests.Integration.csproj +++ b/src/Promitor.Tests.Integration/Promitor.Tests.Integration.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 true diff --git a/src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj b/src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj index 600b2251f..968c513c4 100644 --- a/src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj +++ b/src/Promitor.Tests.Unit/Promitor.Tests.Unit.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.1.15 + 3.1.16 true From 8351b3a444b215243879cb4a5c54ba84ba92bc09 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Wed, 9 Jun 2021 05:04:48 +0000 Subject: [PATCH 3/3] Bump pipeline versions Signed-off-by: GitHub --- build/azure-devops/docs-ci.yml | 2 +- build/azure-devops/variables/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/azure-devops/docs-ci.yml b/build/azure-devops/docs-ci.yml index 00912cde9..5c3ced3ee 100644 --- a/build/azure-devops/docs-ci.yml +++ b/build/azure-devops/docs-ci.yml @@ -11,7 +11,7 @@ pr: - docs/* - changelog/* variables: - DotNet.SDK.Version: '3.1.409' + DotNet.SDK.Version: '3.1.410' DotNet.Configuration: 'release' Image.Name: 'ghcr.io/tomkerkhove/promitor-agent-scraper-ci' Image.TaggedName: '$(Image.Name):$(Build.BuildNumber)' diff --git a/build/azure-devops/variables/build.yml b/build/azure-devops/variables/build.yml index 5898f23dc..5d94e870d 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.409' + DotNet.Sdk.Version: '3.1.410' DotNet.Configuration: 'release'