Skip to content
Snippets Groups Projects
Commit 41a03def authored by Alan Nelson's avatar Alan Nelson
Browse files

Merge branch 'add-jre-to-dotnet-build-server' into 'develop'

Add JRE needed by sonarqube post-scan for sending results to server.

See merge request !62
parents c08d245f 23876568
Branches
No related tags found
2 merge requests!63Add JRE to dotnet build container,!62Add JRE needed by sonarqube post-scan for sending results to server.
...@@ -8,13 +8,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -8,13 +8,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.description="Docker image to build .NET core 3.1 applications" \ org.label-schema.description="Docker image to build .NET core 3.1 applications" \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="University of Nebraska - Lincoln" \ org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.1.0" \ org.label-schema.version="0.1.1" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
maintainer="Roger Feese <rfeese@nebraska.edu>" maintainer="Roger Feese <rfeese@nebraska.edu>"
# Make sure that tools we need are installed # Make sure that tools we need are installed
# JRE for sonarqube scanner post-scan
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git \ git \
openjdk-11-jre \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# sonarscanner (https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-msbuild/) # sonarscanner (https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-msbuild/)
......
...@@ -8,13 +8,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -8,13 +8,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.description="Docker image to build .NET core 5.0 applications" \ org.label-schema.description="Docker image to build .NET core 5.0 applications" \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="University of Nebraska - Lincoln" \ org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.1.0" \ org.label-schema.version="0.1.1" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
maintainer="Roger Feese <rfeese@nebraska.edu>" maintainer="Roger Feese <rfeese@nebraska.edu>"
# Make sure that tools we need are installed # Make sure that tools we need are installed
# JRE for sonarqube scanner post-scan
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git \ git \
openjdk-11-jre \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# sonarscanner (https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-msbuild/) # sonarscanner (https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-msbuild/)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment