Merge branch 'pterodactyl:develop' into develop

pterodactyl-china · Oct 22, 2022 · 6410568 · 6410568
2 parents a53869a + 860b2d8
commit 6410568
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -41,6 +41,8 @@ jobs:
         uses: docker/build-push-action@v2
         if: "contains(github.ref, 'release/v')"
         with:
+          context: .
+          file: ./Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_meta.outputs.tags }}
@@ -50,7 +52,11 @@ jobs:
         uses: docker/build-push-action@v2
         if: "contains(github.ref, 'develop')"
         with:
+          context: .
+          file: ./Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/app/Console/Commands/Overrides/UpCommand.php b/app/Console/Commands/Overrides/UpCommand.php
@@ -21,6 +21,6 @@ public function handle(): int
             return 1;
         }
 
-        return parent::handle();
+        return parent::handle() ?? 0;
     }
 }