From 04c4c87ae3ab8d1c061c7713094effc53ba1bacb Mon Sep 17 00:00:00 2001
From: "Yifeng \"Evan\" Wang" <7312949+doodlewind@users.noreply.github.com>
Date: Fri, 19 Jun 2026 14:45:41 +0800
Subject: [PATCH] Fix Docker workflow for forked PSPDEV builds

---
 .github/workflows/docker.yml | 15 +++++++++++----
 Dockerfile                   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7ae830f..747883c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,6 +9,13 @@ on:
   repository_dispatch:
     types: [run_build]
 
+permissions:
+  contents: read
+  packages: write
+
+env:
+  BASE_DOCKER_IMAGE: ghcr.io/pspdev/psp-packages:latest
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -35,7 +42,7 @@ jobs:
         push: true
         tags: ghcr.io/${{ github.repository }}:develop
         build-args: |
-          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psp-packages:latest
+          BASE_DOCKER_IMAGE=${{ env.BASE_DOCKER_IMAGE }}
 
     - name: Push release to Github registry
       if: startsWith(github.ref, 'refs/tags/')
@@ -47,7 +54,7 @@ jobs:
           ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}
           ghcr.io/${{ github.repository }}:latest
         build-args: |
-          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psp-packages:latest
+          BASE_DOCKER_IMAGE=${{ env.BASE_DOCKER_IMAGE }}
 
     - name: Login to DockerHub
       uses: docker/login-action@v3
@@ -65,7 +72,7 @@ jobs:
         tags: |
           ${{ github.repository }}:develop
         build-args: |
-          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psp-packages:latest
+          BASE_DOCKER_IMAGE=${{ env.BASE_DOCKER_IMAGE }}
 
     - name: Push release to dockerhub
       uses: docker/build-push-action@v5
@@ -77,4 +84,4 @@ jobs:
           ${{ github.repository }}:${{ env.DOCKER_TAG }}
           ${{ github.repository }}:latest
         build-args: |
-          BASE_DOCKER_IMAGE=ghcr.io/${{ github.repository_owner }}/psp-packages:latest
+          BASE_DOCKER_IMAGE=${{ env.BASE_DOCKER_IMAGE }}
diff --git a/Dockerfile b/Dockerfile
index ee45901..b47f98a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_DOCKER_IMAGE
+ARG BASE_DOCKER_IMAGE=ghcr.io/pspdev/psp-packages:latest
 
 FROM $BASE_DOCKER_IMAGE AS builder