From 9e0315e9a6884ee96cc762a0f4b2a8f477a03ef2 Mon Sep 17 00:00:00 2001
From: Conrad Engel <cengel@nebraska.edu>
Date: Fri, 23 Sep 2022 10:28:04 -0500
Subject: [PATCH] Remove .NET 5.0 image
---
Makefile | 5 +----
dotnet-build-server/5.0/Dockerfile | 30 ------------------------------
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 dotnet-build-server/5.0/Dockerfile
diff --git a/Makefile b/Makefile
index fd21b9c..61eb9fb 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_6.0
+dotnet: dotnet_3.1 dotnet_6.0
# PHP Lint Images
####################
@@ -144,9 +144,6 @@ dependency-check: dependency-check/Dockerfile
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_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/
diff --git a/dotnet-build-server/5.0/Dockerfile b/dotnet-build-server/5.0/Dockerfile
deleted file mode 100644
index dd4665b..0000000
--- a/dotnet-build-server/5.0/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim
-
-ARG BUILD_DATE
-ARG VCS_REF
-ARG VERSION
-LABEL org.label-schema.build-date=$BUILD_DATE \
- org.label-schema.name="dotnet SDK 5.0" \
- org.label-schema.description="Docker image to build .NET core 5.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