Skip to content

Commit 4cbeaff

Browse files
authored
chore: bump container image to .NET 6 (#346)
1 parent 2f0fc2f commit 4cbeaff

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:3.1-cbl-mariner1.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:6.0-cbl-mariner2.0 AS build
22
WORKDIR /app
33
COPY . .
44
RUN dotnet publish -c Release -o out \
@@ -8,18 +8,15 @@ RUN dotnet publish -c Release -o out \
88
-p:PublishReadyToRun=false \
99
-p:IncludeNativeLibrariesForSelfExtract=true \
1010
-p:PublishSingleFile=true \
11-
-p:PublishTrimmed=true \
12-
-p:TrimUnusedDependencies=true \
1311
./src/Microsoft.ComponentDetection
1412

15-
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-cbl-mariner1.0 AS runtime
13+
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-cbl-mariner2.0 AS runtime
1614
WORKDIR /app
1715
COPY --from=build /app/out ./
1816

1917
RUN tdnf install -y \
2018
golang \
2119
moby-engine \
22-
gradle \
2320
maven \
2421
pnpm \
2522
poetry \

src/Microsoft.ComponentDetection.Orchestrator/Services/DetectorProcessingService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,8 @@ public ExcludeDirectoryPredicate GenerateDirectoryExclusionPredicate(string orig
137137

138138
if (directoryExclusionListObsolete?.Any() == true)
139139
{
140+
// Note: directory info will *automatically* parent relative paths to the working directory of the current assembly. Hold on to your rear.
140141
var directories = directoryExclusionListObsolete
141-
142-
// Note: directory info will *automatically* parent relative paths to the working directory of the current assembly. Hold on to your rear.
143142
.Select(relativeOrAbsoluteExclusionPath => new DirectoryInfo(relativeOrAbsoluteExclusionPath))
144143
.Select(exclusionDirectoryInfo => new
145144
{

0 commit comments

Comments
 (0)