Skip to content

Fix Docker workflow for forked PSPDEV builds #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlewind merged 1 commit into from
Jun 19, 2026
Merged

Fix Docker workflow for forked PSPDEV builds #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/')
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_DOCKER_IMAGE
ARG BASE_DOCKER_IMAGE=ghcr.io/pspdev/psp-packages:latest

FROM $BASE_DOCKER_IMAGE AS builder

Expand Down
Loading