From 3b56a21a273a83f709217a6f03d6754d0c3a892c Mon Sep 17 00:00:00 2001 From: Andrey Paramonov Date: Wed, 7 Jul 2021 19:08:40 +0300 Subject: [PATCH 1/2] Add .Net 5 support --- Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cb214c..cb88195 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk +FROM mcr.microsoft.com/dotnet/sdk:5.0 LABEL "com.github.actions.name"="dotnet-sonarscanner" LABEL "com.github.actions.description"="sonarscanner for dotnet core" @@ -9,14 +9,19 @@ LABEL "repository"="https://github.com/Secbyte/dotnet-sonarscanner" LABEL "homepage"="https://github.com/Secbyte/dotnet-sonarscanner" LABEL "maintainer"="Joshua Duffy " -RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg && \ +# jre installation require man folder to exist +RUN mkdir -p /usr/share/man/man1 + +RUN apt-get update && \ + apt-get install -y --no-install-recommends gnupg && \ + wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg && \ mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ && \ wget -q https://packages.microsoft.com/config/debian/10/prod.list && \ mv prod.list /etc/apt/sources.list.d/microsoft-prod.list && \ chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg && \ chown root:root /etc/apt/sources.list.d/microsoft-prod.list && \ apt-get update && \ - apt-get install -y --no-install-recommends default-jre apt-transport-https aspnetcore-runtime-2.1 mono-complete && \ + apt-get install -y --no-install-recommends default-jre apt-transport-https aspnetcore-runtime-5.0 mono-complete && \ apt-get install -y --no-install-recommends python3 python3-distutils python3-pip python3-setuptools && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* && \ apt-get autoremove -y && \ From 1bbf0fe696a864ec07f00afe1122c54426809fe6 Mon Sep 17 00:00:00 2001 From: Andrew Paramonov Date: Wed, 7 Jul 2021 20:12:47 +0300 Subject: [PATCH 2/2] Upgrade dotnet-sonarscanner version to 5.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb88195..1d5fdc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends python3 python3-distutils python3-pip python3-setuptools && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* && \ apt-get autoremove -y && \ - dotnet tool install dotnet-sonarscanner --tool-path . --version 4.7.1 + dotnet tool install dotnet-sonarscanner --tool-path . --version 5.2.2 ADD entrypoint.sh /entrypoint.sh