Dockerfile paths

digirati-co-uk · Nov 24, 2023 · c8e8fbd · c8e8fbd
1 parent 00fd736
commit c8e8fbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -14,8 +14,8 @@ jobs:
         name: build and push
         with:
           image-name: "preservation-api"
-          dockerfile: "./LeedsExperiment/Preservation.API/Dockerfile"
-          context: "./LeedsExperiment/Preservation.API"
+          dockerfile: "./Preservation.API/Dockerfile"
+          context: "LeedsExperiment"
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
   build-push-dashboard:
@@ -24,9 +24,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/docker-build-and-push
         with:
-          image-name: "dashboard"
-          dockerfile: "./LeedsExperiment/Dashboard/Dockerfile"
-          context: "./LeedsExperiment/Dashboard"
+          image-name: "dashboard"      
+          dockerfile: ./Dashboard/Dockerfile
+          context: LeedsExperiment/
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
 
diff --git a/LeedsExperiment/Preservation.API/Dockerfile b/LeedsExperiment/Preservation.API/Dockerfile
@@ -17,7 +17,7 @@ RUN dotnet build "./Preservation.API.csproj" -c $BUILD_CONFIGURATION -o /app/bui
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./Preservation.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./Preservation.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:ErrorOnDuplicatePublishOutputFiles=false
 
 FROM base AS final
 WORKDIR /app