fix for docker ci/cd?

mplogas · Mar 16, 2024 · a42636d · a42636d
1 parent ca78451
commit a42636d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/docker-build_push.yml b/.github/workflows/docker-build_push.yml
@@ -40,6 +40,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
         context: ./KernelMemory.FileWatcher
+        dockerfile: ./KernelMemory.FileWatcher/Dockerfile
         push: true
         platforms: linux/amd64,linux/arm64
         labels: ${{ steps.meta.outputs.labels }}

diff --git a/KernelMemory.FileWatcher.sln b/KernelMemory.FileWatcher.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KernelMemory.FileWatcher",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{839FC6AE-D66B-407C-9461-4C394EF5CBEE}"
 	ProjectSection(SolutionItems) = preProject
+		.dockerignore = .dockerignore
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		G:\docker\km-filewatcher\appsettings.json = G:\docker\km-filewatcher\appsettings.json

diff --git a/KernelMemory.FileWatcher/Dockerfile b/KernelMemory.FileWatcher/Dockerfile
@@ -9,10 +9,9 @@ WORKDIR /app
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["KernelMemory.FileWatcher/KernelMemory.FileWatcher.csproj", "KernelMemory.FileWatcher/"]
-RUN dotnet restore "./KernelMemory.FileWatcher/./KernelMemory.FileWatcher.csproj"
-COPY . .
-WORKDIR "/src/KernelMemory.FileWatcher"
+COPY ["./KernelMemory.FileWatcher.csproj", "./"]
+RUN dotnet restore ./KernelMemory.FileWatcher.csproj
+COPY . ./
 RUN dotnet build "./KernelMemory.FileWatcher.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish