From e57cb688f12cbc9238958c059e00b56c79f1c159 Mon Sep 17 00:00:00 2001 From: jaalferreira Date: Wed, 31 Jul 2024 14:05:02 +0100 Subject: [PATCH] Updated dotnet 8 image and README file + removed Java installation --- Dockerfile | 20 ++++---------------- README.md | 11 ++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f1367b..09ed3a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,15 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0.424 +FROM mcr.microsoft.com/dotnet/sdk:8.0.303 # Dockerfile meta-information LABEL maintainer="NOS Inovação S.A." \ app_name="dotnet-sonar" ENV SONAR_SCANNER_MSBUILD_VERSION=7.1.1.96069 \ - DOTNETCORE_SDK=6.0.424 \ - DOTNETCORE_RUNTIME=6.0.32 \ + DOTNETCORE_SDK=8.0.303 \ + DOTNETCORE_RUNTIME=8.0.7 \ NETAPP_VERSION=net \ - DOCKER_VERSION=5:24.0.7-1~debian.11~bullseye \ + DOCKER_VERSION=5:24.0.7-1~debian.12~bookworm \ CONTAINERD_VERSION=1.6.25-1 \ - # OPENJDK_VERSION=17 \ NODEJS_VERSION=20 # Linux update @@ -18,7 +17,6 @@ RUN apt-get update \ && apt-get dist-upgrade -y \ && apt-get install -y \ apt-transport-https \ - # ca-certificates-java \ ca-certificates \ curl \ locales \ @@ -37,9 +35,6 @@ ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en -# Install Java -# RUN apt-get install -y openjdk-$OPENJDK_VERSION-jre - # Install NodeJs RUN wget https://deb.nodesource.com/setup_$NODEJS_VERSION.x \ && bash setup_$NODEJS_VERSION.x \ @@ -57,13 +52,6 @@ RUN mkdir -p /etc/apt/keyrings \ docker-ce-cli=$DOCKER_VERSION \ containerd.io=$CONTAINERD_VERSION -# Need to install DotNet5 SDK - Only needed until there's no sonar-scanner with dotNet6 support -# RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ -# && dpkg -i packages-microsoft-prod.deb \ -# && rm packages-microsoft-prod.deb \ -# && apt-get update \ -# && apt-get install -y dotnet-sdk-5.0 - # 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-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip \ diff --git a/README.md b/README.md index 60da1ec..3d5bc62 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ 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 6.0.424 -* dotnetcore-runtime 6.0.32 (required by Sonar-Scanner) +* dotnetcore-sdk 8.0.303 +* dotnetcore-runtime 8.0.7 (required by Sonar-Scanner) * SonarQube MSBuild Scanner 7.1.1.96069 * Docker binaries 24.0.x (for running Docker in Docker using the docker.sock mount) * NodeJS 20 (required by Sonar-Scanner web analysis plugins) @@ -18,9 +18,9 @@ This latest image was built with the following components: > Tags are written using the following pattern: `dotnet-sonar:..` -* `24.06.5`, `latest8`, `latest`, `24.06-dotnet8` [(24.06.5/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.06.5/Dockerfile) - * DotNet 8.0.302 - * SonarScanner 6.2.0.85879 +* `24.07.5`, `latest8`, `latest`, `24.07-dotnet8` [(24.07.5/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.07.5/Dockerfile) + * DotNet 8.0.303 + * SonarScanner 7.1.1.96069 * `24.07.3`, `latest6`, `24.07-dotnet6` [(24.07.3/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.07.3/Dockerfile) * DotNet 6.0.424 * SonarScanner 7.1.1.96069 @@ -32,6 +32,7 @@ This latest image was built with the following components: * `22.07.1`, `latest5` [(22.07.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/22.07.1/Dockerfile) * DotNet 5.0.408 * SonarScanner 5.7.1.49528 +* `24.06.5` [(24.06.5/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.06.5/Dockerfile) * `24.06.3` [(24.06.3/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.06.3/Dockerfile) * `24.05.5` [(24.05.5/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.05.5/Dockerfile) * `24.05.3` [(24.05.3/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.05.3/Dockerfile)