Fix Docker image build

xoofx · Dec 28, 2023 · 78a7930 · 78a7930
1 parent 619addb
commit 78a7930
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,6 @@
-.github
+.github
+examples/docker/unity_packages
+
+**/.vs
+**/bin
+**/obj
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - '*'
+  pull_request:
 
 env:
   PROJECT_NAME: UnityNuGet
@@ -28,6 +29,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
+        if: github.event_name == 'push'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -44,7 +46,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: true
+          push: ${{ github.event_name == 'push' }}
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /app
 
 RUN mkdir -p src/UnityNuGet && mkdir -p src/UnityNuGet.Server && mkdir -p src/UnityNuGet.Tests
 
+COPY src/Directory.Build.props src/Directory.Build.props
+COPY src/Directory.Packages.props src/Directory.Packages.props
 COPY src/*.sln src
 COPY src/UnityNuGet/*.csproj src/UnityNuGet
 COPY src/UnityNuGet.Server/*.csproj src/UnityNuGet.Server