Merge pull request #2 from awaescher/doc

Update ci.yml
awaescher · May 19, 2024 · 5cee489 · 5cee489
2 parents 13cb002 + aebeffb
commit 5cee489
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
       run: dotnet test --no-build --configuration=Release --verbosity normal
 
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag awaescher/maxpower:${{steps.gitversion.outputs.semVer}} --tag awaescher/maxpower:latest --build-arg SEMVERSION=${{steps.gitversion.outputs.semVer}}
+      run: docker build . --file Dockerfile --tag awaescher/maxpower:${{steps.gitversion.outputs.semVer}} --tag awaescher/maxpower:latest --build-arg SEMVERSION=${{steps.gitversion.outputs.FullSemVer}}  --build-arg ASSEMBLYSEMVERSION=${{steps.gitversion.outputs.AssemblySemVer}}
 
     - name: Log in to Docker Hub
       uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0.101 AS build
 WORKDIR /
 
+ARG ASSEMBLYSEMVERSION
 ARG SEMVERSION
 
 # copy csproj and restore as distinct layers
@@ -16,12 +17,12 @@ WORKDIR /
 COPY ./MaxPower /app/MaxPower/
 COPY ./MaxTalkSharp /app/MaxTalkSharp/
 WORKDIR /app/MaxPower/
-RUN dotnet publish -c Release -r linux-arm64 -o out -p:PublishSingleFile=true --self-contained true /p:AssemblyVersion=$SEMVERSION /p:Version=$SEMVERSION
+RUN dotnet publish -c Release -r linux-arm64 -o out -p:PublishSingleFile=true --self-contained true /p:AssemblyVersion=$ASSEMBLYSEMVERSION /p:Version=$SEMVERSION
 
 # RUNTIME CONTAINER
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.2-jammy-arm64v8 AS runtime
 EXPOSE 80
 WORKDIR /app
 COPY --from=build /app/MaxPower/out ./
 #RUN rm /app/appsettings.Development.json
-ENTRYPOINT ["./MaxPower", ""]
+ENTRYPOINT ["./MaxPower", ""]