Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update .NET Core Docker containers Docker tags #926

Merged
merged 4 commits into from
Mar 25, 2020
Merged

Update .NET Core Docker containers Docker tags #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34e0227
Update .NET Core Docker containers Docker tags
renovate-bot Mar 24, 2020
f0a1fb8
Update SDK version in builds
tomkerkhove Mar 25, 2020
9c1c23e
Update RuntimeFrameworkVersion
tomkerkhove Mar 25, 2020
c99451f
Use variable group
tomkerkhove Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions build/azure-devops/scraper-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ pr:
- charts/promitor-agent-scraper/*
- deploy/automation/docker-hub/ci/* # Add Docker Hub bot here to trigger it for testing sake
variables:
DotNet.SDK.Version: '3.1.101'
DotNet.Configuration: 'release'
Image.Name: 'tomkerkhove/promitor-agent-scraper-ci'
Image.TaggedName: '$(Image.Name):$(Tags.PR)'
Helm.Chart.Version: '0.0.0-$(App.Version)'
Helm.Chart.Name: 'promitor-agent-scraper-ci'
- template: ./variables/build.yml
- name: Image.Name
value: 'tomkerkhove/promitor-agent-scraper-ci'
- name: Image.TaggedName
value: '$(Image.Name):$(Tags.PR)'
- name: Helm.Chart.Version
value: '0.0.0-$(App.Version)'
- name: Helm.Chart.Name
value: 'promitor-agent-scraper-ci'
stages:
- stage: Init
displayName: Prepare Build
Expand Down
3 changes: 2 additions & 1 deletion build/azure-devops/variables/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
variables:
DotNet.Sdk.Version: '3.1.200'
DotNet.Sdk.Version: '3.1.201'
DotNet.Configuration: 'release'
2 changes: 1 addition & 1 deletion src/Promitor.Core.Configuration/Promitor.Core.Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Scraping/Promitor.Core.Scraping.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
<LangVersion>8</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Telemetry.Metrics/Promitor.Core.Telemetry.Metrics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core.Telemetry/Promitor.Core.Telemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Core/Promitor.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Integrations.AzureMonitor/Promitor.Integrations.AzureMonitor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Integrations.AzureStorage/Promitor.Integrations.AzureStorage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Promitor.Scraper.Host/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.200 AS build
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201 AS build
WORKDIR /src
COPY Promitor.Core/* Promitor.Core/
COPY Promitor.Core.Configuration/* Promitor.Core.Configuration/
Expand All @@ -10,7 +10,7 @@ COPY Promitor.Integrations.AzureStorage/* Promitor.Integrations.AzureStorage/
COPY Promitor.Scraper.Host/* Promitor.Scraper.Host/
RUN dotnet publish Promitor.Scraper.Host/Promitor.Scraper.Host.csproj --configuration release --output app

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.2 as runtime
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.3 as runtime
WORKDIR /app
ARG CONFIG_FOLDER="/config/"
ENV PROMITOR_INTERNAL_CONFIG_FOLDER=$CONFIG_FOLDER
Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Scraper.Host/Promitor.Scraper.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
<!--<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>-->
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Promitor.Scraper.Tests.Unit/Promitor.Scraper.Tests.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>3.1.3</RuntimeFrameworkVersion>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

Expand Down