Skip to content

Commit

Permalink
Updated dotnet 6 image, SonarScanner image, and README file + comment…
Browse files Browse the repository at this point in the history
…ed Java installation
  • Loading branch information
jaimesantosferreira committed Jul 31, 2024
1 parent 1f07ab6 commit c612ea2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0.302
FROM mcr.microsoft.com/dotnet/sdk:6.0.424

# Dockerfile meta-information
LABEL maintainer="NOS Inovação S.A." \
app_name="dotnet-sonar"

ENV SONAR_SCANNER_MSBUILD_VERSION=6.2.0.85879 \
DOTNETCORE_SDK=8.0.302 \
DOTNETCORE_RUNTIME=8.0.6 \
ENV SONAR_SCANNER_MSBUILD_VERSION=7.1.1.96069 \
DOTNETCORE_SDK=6.0.424 \
DOTNETCORE_RUNTIME=6.0.32 \
NETAPP_VERSION=net \
DOCKER_VERSION=5:24.0.7-1~debian.12~bookworm \
DOCKER_VERSION=5:24.0.7-1~debian.11~bullseye \
CONTAINERD_VERSION=1.6.25-1 \
OPENJDK_VERSION=17 \
# OPENJDK_VERSION=17 \
NODEJS_VERSION=20

# Linux update
RUN apt-get update \
&& apt-get dist-upgrade -y \
&& apt-get install -y \
apt-transport-https \
ca-certificates-java \
# ca-certificates-java \
ca-certificates \
curl \
locales \
Expand All @@ -38,7 +38,7 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

# Install Java
RUN apt-get install -y openjdk-$OPENJDK_VERSION-jre
# RUN apt-get install -y openjdk-$OPENJDK_VERSION-jre

# Install NodeJs
RUN wget https://deb.nodesource.com/setup_$NODEJS_VERSION.x \
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ 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 8.0.302
* dotnetcore-runtime 8.0.6 (required by Sonar-Scanner)
* SonarQube MSBuild Scanner 6.2.0.85879
* dotnetcore-sdk 6.0.424
* dotnetcore-runtime 6.0.32 (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)
* OpenJDK Java Runtime 17 (required by Sonar-Scanner and some Sonar-Scanner plugins)
* NodeJS 20 (required by Sonar-Scanner web analysis plugins)

## Supported tags and respective `Dockerfile` links
Expand All @@ -22,9 +21,9 @@ This latest image was built with the following components:
* `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.06.3`, `latest6`, `24.06-dotnet6` [(24.06.3/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.06.3/Dockerfile)
* DotNet 6.0.423
* SonarScanner 6.2.0.85879
* `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
> :warning: **[(THIS VERSION HAS REACHED END OF LIFE)](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)**
* `24.05.4`, `latest7`, `24.05-dotnet7` [(24.05.4/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.05.4/Dockerfile)
* DotNet 7.0.409
Expand All @@ -33,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.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)
* `24.02.5` [(24.02.5/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/24.02.5/Dockerfile)
Expand Down

0 comments on commit c612ea2

Please sign in to comment.