From 50cddefd8b8485d1c9e7c6613269e6aa8df92548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gil=20Assun=C3=A7=C3=A3o?= Date: Wed, 28 Jul 2021 11:10:20 +0100 Subject: [PATCH] Update Dockerfile and Readme for DotNetCore 5.0.302 with SonarScanner 5.2.2 --- Dockerfile | 14 +++++++------- README.md | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f83ce0..5678921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.411 +FROM mcr.microsoft.com/dotnet/sdk:5.0.302 # Dockerfile meta-information LABEL maintainer="NOS Inovação S.A." \ app_name="dotnet-sonar" ENV SONAR_SCANNER_MSBUILD_VERSION=5.2.2.33595 \ - DOTNETCORE_SDK=3.1.411 \ - DOTNETCORE_RUNTIME=3.1.17 \ - NETCOREAPP_VERSION=netcoreapp3.0 \ + DOTNETCORE_SDK=5.0.302 \ + DOTNETCORE_RUNTIME=5.0.8 \ + NETAPP_VERSION=net5.0 \ DOCKER_VERSION=5:20.10.7~3-0~debian-buster \ CONTAINERD_VERSION=1.4.8-1 \ OPENJDK_VERSION=11 \ @@ -48,9 +48,9 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \ # 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-$NETCOREAPP_VERSION.zip \ - && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETCOREAPP_VERSION.zip -d /sonar-scanner \ - && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETCOREAPP_VERSION.zip \ + && wget https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/$SONAR_SCANNER_MSBUILD_VERSION/sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip \ + && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip -d /sonar-scanner \ + && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip \ && chmod +x -R /sonar-scanner # Cleanup diff --git a/README.md b/README.md index c27115b..4b1f80f 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,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 5.0.301 -* dotnetcore-runtime 5.0.7 (required by Sonar-Scanner) -* SonarQube MSBuild Scanner 5.2.1.31210 +* dotnetcore-sdk 5.0.302 +* dotnetcore-runtime 5.0.8 (required by Sonar-Scanner) +* SonarQube MSBuild Scanner 5.2.2.33595 * Docker binaries 20.10.x (for running Docker in Docker using the docker.sock mount) * OpenJDK Java Runtime 11 (required by Sonar-Scanner and some Sonar-SCanner plugins) * NodeJS 16 (required by Sonar-Scanner web analysis plugins) @@ -26,12 +26,14 @@ This latest image was built with the following components: > Tags are written using the following pattern: `dotnet-sonar:..` -* `21.06.1`, `latest` [(21.06.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.06.1/Dockerfile) - * DotNet 5.0.301 - * SonarScanner 5.2.1.31210 +* `21.07.1`, `latest` [(21.07.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.07.1/Dockerfile) + * DotNet 5.0.302 + * SonarScanner 5.2.2.33595 +* `21.07.0` [(21.07.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.07.0/Dockerfile) + * DotNetCore 3.1.411 + * SonarScanner 5.2.2.33595 +* `21.06.1` [(21.06.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.06.1/Dockerfile) * `21.06.0` [(21.06.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.06.0/Dockerfile) - * DotNetCore 3.1.410 - * SonarScanner 5.2.1.31210 * `21.05.1` [(21.05.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.1/Dockerfile) * `21.05.0` [(21.05.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.0/Dockerfile) * `21.04.1` [(21.04.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.04.1/Dockerfile)