From cfcf8d4d814a6d93bd5b061413251dbd2eda9780 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Wed, 4 Dec 2019 20:04:44 +0100 Subject: [PATCH] update to core 3.1 and sonnar 4.8.0 --- Dockerfile | 18 +++++++++--------- README.md | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13ad6a6..b441b2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100 # Dockerfile meta-information LABEL maintainer="NOS Inovação S.A." \ app_name="dotnet-sonar" # Reviewing this choices -ENV SONAR_SCANNER_MSBUILD_VERSION=4.7.1.2311 \ - DOTNETCORE_SDK=3.0.100 \ - DOTNETCORE_RUNTIME=2.2.7 \ +ENV SONAR_SCANNER_MSBUILD_VERSION=4.8.0.12008 \ + DOTNETCORE_SDK=3.1.100 \ + DOTNETCORE_RUNTIME=3.1.0 \ DOCKER_VERSION=5:19.03.2~3-0~debian-buster \ CONTAINERD_VERSION=1.2.6-3 @@ -46,17 +46,17 @@ RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \ RUN wget -q https://packages.microsoft.com/config/ubuntu/19.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb -# Install DotNetCore 2.1 Runtime-Only for SonarScanner +# Install DotNetCore 3.1 Runtime-Only for SonarScanner RUN apt-get update -y \ && apt-get install apt-transport-https -y \ && apt-get update -y \ - && apt-get install aspnetcore-runtime-2.2 -y + && apt-get install aspnetcore-runtime-3.1 -y # Install Sonar Scanner RUN apt-get install -y unzip \ - && wget https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/$SONAR_SCANNER_MSBUILD_VERSION/sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp2.0.zip \ - && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp2.0.zip -d /sonar-scanner \ - && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp2.0.zip \ + && wget https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/$SONAR_SCANNER_MSBUILD_VERSION/sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp3.0.zip \ + && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp3.0.zip -d /sonar-scanner \ + && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-netcoreapp3.0.zip \ && chmod +x -R /sonar-scanner # Cleanup diff --git a/README.md b/README.md index e5ffed6..5931798 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ It also allows you to run Docker in Docker using a docker.sock mount. ---- This latest image was built with the following components: -* dotnetcore-sdk-3.0.100 -* dotnetcore-runtime-2.2.7 (required by Sonar Scanner) -* SonarQube MSBuild Scanner 4.7.1.2311 +* dotnetcore-sdk-3.1.100 +* dotnetcore-runtime-3.1.100 (required by Sonar Scanner) +* SonarQube MSBuild Scanner 4.8.0.12008 * OpenJDK Java Runtime 11 (required by Sonar Scanner) * Docker binaries 19.03.1 (for running Docker in Docker using the docker.sock mount) * NodeJS 11 @@ -20,7 +20,10 @@ This latest image was built with the following components: > Tags are written using the following pattern: `dotnet-sonar:..` -* `19.10.1`, `latest` [(19.10.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/19.10.1/Dockerfile) +* `19.12.1`, `latest` [(19.12.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/19.12.1/Dockerfile) + * DotNetCore SDK 3.1.100 + * SonarScanner 4.8.0.12008 +* `19.10.1` [(19.10.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/19.10.1/Dockerfile) * DotNetCore SDK 3.0.100 * SonarScanner 4.7.1.2311 * `19.09.0` [(19.09-0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/19.09.0/Dockerfile)