Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
UNL ITS
docker-ci
Commits
9e0315e9
Commit
9e0315e9
authored
2 years ago
by
Conrad Engel
Browse files
Options
Downloads
Patches
Plain Diff
Remove .NET 5.0 image
parent
40130e1e
No related branches found
No related tags found
2 merge requests
!76
Add dotnet 6.0
,
!75
Add dotnet 6.0 image
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-4
1 addition, 4 deletions
Makefile
dotnet-build-server/5.0/Dockerfile
+0
-30
0 additions, 30 deletions
dotnet-build-server/5.0/Dockerfile
with
1 addition
and
34 deletions
Makefile
+
1
−
4
View file @
9e0315e9
...
...
@@ -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/
...
...
This diff is collapsed.
Click to expand it.
dotnet-build-server/5.0/Dockerfile
deleted
100644 → 0
+
0
−
30
View file @
40130e1e
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment