From 40130e1e62d45f3ea7af9d324d136264fae7d362 Mon Sep 17 00:00:00 2001
From: Conrad Engel <cengel@nebraska.edu>
Date: Thu, 22 Sep 2022 12:46:04 -0500
Subject: [PATCH] Add dotnet 6.0 image
---
Makefile | 4 +++-
dotnet-build-server/6.0/Dockerfile | 30 ++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 dotnet-build-server/6.0/Dockerfile
diff --git a/Makefile b/Makefile
index 476f077..fd21b9c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-te
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_5.0
+dotnet: dotnet_3.1 dotnet_5.0 dotnet_6.0
# PHP Lint Images
####################
@@ -147,6 +147,8 @@ dotnet_3.1: dotnet-build-server/3.1/Dockerfile
dotnet_5.0: dotnet-build-server/5.0/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/dotnet-build-server:5.0 -f dotnet-build-server/5.0/Dockerfile dotnet-build-server/5.0/
+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/
#IMAGES_TO_SCAN = $(shell docker images --format '{{.Repository}}:{{.Tag}}' | grep unl-its )
#security:
diff --git a/dotnet-build-server/6.0/Dockerfile b/dotnet-build-server/6.0/Dockerfile
new file mode 100644
index 0000000..e684613
--- /dev/null
+++ b/dotnet-build-server/6.0/Dockerfile
@@ -0,0 +1,30 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+ org.label-schema.name="dotnet SDK 6.0" \
+ org.label-schema.description="Docker image to build .NET core 6.0 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 -
+# 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 \
+ 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
--
GitLab