Skip to content

Commit 81550f1

Browse files
authored
Fix docker build (#456)
1 parent 6d813c1 commit 81550f1

File tree

7 files changed

+31
-35
lines changed

7 files changed

+31
-35
lines changed

Dockerfile

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
ARG BUILD_IMAGE_TAG="7.0-jammy"
2-
ARG RUN_IMAGE_TAG="7.0-alpine"
1+
# Usage: docker buildx build .
2+
3+
ARG BUILD_IMAGE_TAG="8.0-jammy"
4+
ARG RUN_IMAGE_TAG="8.0-alpine"
5+
6+
#ARG PLATFORM=$BUILDPLATFORM
7+
ARG PLATFORM=$TARGETPLATFORM
38

49
#########################################################################
5-
# build and publish
10+
# .NET build
611
#########################################################################
712

8-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:$BUILD_IMAGE_TAG AS build
9-
ARG BUILD_CONFIGURATION=Release
10-
11-
ARG TARGETARCH
12-
ARG TARGETPLATFORM
13-
ARG BUILDPLATFORM
13+
# ARG BUILDPLATFORM
14+
FROM --platform=$PLATFORM mcr.microsoft.com/dotnet/sdk:$BUILD_IMAGE_TAG AS build
1415

15-
WORKDIR /src
16-
COPY ["service/Service/Service.csproj", "service/Service/"]
17-
RUN dotnet restore "./service/Service/./Service.csproj"
16+
ARG BUILD_CONFIGURATION=Release
1817

19-
COPY ["extensions", "extensions"]
20-
COPY ["tools", "tools"]
21-
COPY ["service", "service"]
18+
COPY . /src/
2219
WORKDIR "/src/service/Service"
23-
RUN dotnet build "./Service.csproj" -c $BUILD_CONFIGURATION -o /app/build
24-
25-
FROM build AS publish
26-
ARG BUILD_CONFIGURATION=Release
20+
RUN dotnet build Service.csproj -c $BUILD_CONFIGURATION -o /app/build
2721
RUN dotnet publish "./Service.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
2822

2923
#########################################################################
30-
# run
24+
# prepare final content
3125
#########################################################################
3226

33-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:$RUN_IMAGE_TAG AS base
27+
ARG PLATFORM
28+
FROM --platform=$PLATFORM mcr.microsoft.com/dotnet/aspnet:$RUN_IMAGE_TAG AS base
29+
3430
# Non-root user that will run the service
3531
ARG USER=km
32+
33+
WORKDIR /app
34+
3635
RUN \
3736
# Create user
3837
#Debian: useradd --create-home --user-group $USER --shell /bin/bash && \
3938
adduser -D -h /app -s /bin/sh $USER && \
4039
# Allow user to access the build
4140
chown -R $USER.$USER /app
4241

42+
COPY --from=build --chown=km:km --chmod=0550 /app/publish .
43+
44+
#########################################################################
45+
# runtime
46+
#########################################################################
47+
48+
LABEL org.opencontainers.image.authors="Devis Lucato, https://github.com/dluc"
49+
MAINTAINER Devis Lucato "https://github.com/dluc"
50+
4351
# Define current user
4452
USER $USER
4553

4654
# Used by .NET and KM to load appsettings.Production.json
4755
ENV ASPNETCORE_ENVIRONMENT Production
4856
ENV ASPNETCORE_URLS http://+:9001
57+
ENV ASPNETCORE_HTTP_PORTS 9001
4958

50-
WORKDIR /app
5159
EXPOSE 9001
5260

53-
FROM base AS final
54-
55-
MAINTAINER Devis Lucato "https://github.com/dluc"
56-
LABEL org.opencontainers.image.authors="Devis Lucato, https://github.com/dluc"
57-
WORKDIR /app
58-
59-
COPY --from=publish --chown=km:km --chmod=0550 /app/publish .
60-
6161
# Define executable
6262
ENTRYPOINT ["dotnet", "Microsoft.KernelMemory.ServiceAssembly.dll"]
File renamed without changes.

clients/dotnet/WebClient/icon.png

15.2 KB
Loading

nuget-package.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<None Include="$(RepoRoot)/packages/icon.png" Link="icon.png" Pack="true" PackagePath="." Visible="false" />
46+
<None Include="icon.png" Link="icon.png" Pack="true" PackagePath="." Visible="false" />
4747
</ItemGroup>
4848

4949
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

nuget.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@
55
<packageSources>
66
<clear />
77
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
8-
<add key="Local" value="packages" />
98
</packageSources>
109

1110
<packageSourceMapping>
1211
<packageSource key="nuget.org">
1312
<package pattern="*" />
1413
</packageSource>
15-
<packageSource key="Local">
16-
<package pattern="*" />
17-
</packageSource>
1814
</packageSourceMapping>
1915

2016
</configuration>

service/Core/icon.png

15.2 KB
Loading

service/Service.AspNetCore/icon.png

15.2 KB
Loading

0 commit comments

Comments
 (0)