Merge branch 'develop' into 'master'

Update dotnet-build-server jre and remove 3.1

See merge request !90

Makefile

@@ -30,7 +30,7 @@ php-browser-test: php-browser-test_8.2 php-browser-test_latest
 mobile: android-build-server
 static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android
 utility: alpine-ssh-client merge-request-check
-dotnet: dotnet_3.1 dotnet_6.0
+dotnet: dotnet_6.0
 
 # PHP Lint Images
 ####################
@@ -144,9 +144,6 @@ dependency-check: dependency-check/Dockerfile
 
 # dotnet Images
 ####################
-dotnet_3.1: dotnet-build-server/3.1/Dockerfile
-	docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:3.1 -f dotnet-build-server/3.1/Dockerfile dotnet-build-server/3.1/
-
 dotnet_6.0: dotnet-build-server/6.0/Dockerfile
 	docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:6.0 -f dotnet-build-server/6.0/Dockerfile dotnet-build-server/6.0/
 

dotnet-build-server/3.1/Dockerfile

-FROM mcr.microsoft.com/dotnet/sdk:3.1-buster
-
-ARG BUILD_DATE
-ARG VCS_REF
-ARG VERSION
-LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name="dotnet SDK 3.1" \
-      org.label-schema.description="Docker image to build .NET core 3.1 applications" \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vendor="University of Nebraska - Lincoln" \
-      org.label-schema.version="0.1.2" \
-      org.label-schema.schema-version="1.0" \
-      maintainer="Roger Feese <rfeese@nebraska.edu>"
-
-# Make sure that tools we need are installed
-# Add external nodejs LTS apt source
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-# JRE, NodeJS for sonarqube scanner post-scan
-RUN apt-get update && apt-get install -y \
-    git \
-    openjdk-11-jre \
-    nodejs \
-    && rm -rf /var/lib/apt/lists/*
-
-# sonarscanner (https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-msbuild/)
-RUN dotnet tool install --global dotnet-sonarscanner
-RUN dotnet tool install --global trx2junit
-ENV PATH=/root/.dotnet/tools:$PATH

dotnet-build-server/6.0/Dockerfile

@@ -14,13 +14,13 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 
 # Make sure that tools we need are installed
 # Add external nodejs LTS apt source
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
 # Create missing man directores for update-alternatives
 RUN mkdir -p /usr/share/man/man1
 # JRE, NodeJS for sonarqube scanner post-scan
 RUN apt-get update && apt-get install -y \
     git \
-    openjdk-11-jre \
+    openjdk-17-jre \
     nodejs \
     && rm -rf /var/lib/apt/lists/*