From 3bbc9c0937c64612342d25aeb77e52f77b563b5a Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@nebraska.edu>
Date: Thu, 28 Oct 2021 13:23:12 -0500
Subject: [PATCH] Add nodejs install and increment schema versions.

---
 dotnet-build-server/3.1/Dockerfile | 7 +++++--
 dotnet-build-server/5.0/Dockerfile | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dotnet-build-server/3.1/Dockerfile b/dotnet-build-server/3.1/Dockerfile
index 566b4da..fbe7990 100644
--- a/dotnet-build-server/3.1/Dockerfile
+++ b/dotnet-build-server/3.1/Dockerfile
@@ -8,15 +8,18 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       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.1" \
+      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
-# JRE for sonarqube scanner post-scan
+# 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/)
diff --git a/dotnet-build-server/5.0/Dockerfile b/dotnet-build-server/5.0/Dockerfile
index 844e965..dd4665b 100644
--- a/dotnet-build-server/5.0/Dockerfile
+++ b/dotnet-build-server/5.0/Dockerfile
@@ -8,15 +8,20 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       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.1" \
+      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
-# JRE for sonarqube scanner post-scan
+# 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/)
-- 
GitLab