Skip to content

Commit 4251b0e

Browse files
authored
Merge pull request #4 from jackh54/claude/docker-actions-fork-issue-ps6fuc
Fix Docker workflow for fork: publish to own GHCR namespace and build frontend natively
2 parents f1caa79 + 0672837 commit 4251b0e

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id: docker_meta
2525
uses: docker/metadata-action@v5
2626
with:
27-
images: ghcr.io/pterodactyl/panel
27+
images: ghcr.io/${{ github.repository }}
2828
flavor: |
2929
latest=false
3030
tags: |

Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
# Build the assets that are needed for the frontend. This build stage is then discarded
33
# since we won't need NodeJS anymore in the future. This Docker image ships a final production
44
# level distribution of Pterodactyl.
5-
FROM --platform=$TARGETOS/$TARGETARCH node:22-alpine
5+
#
6+
# This always runs on the native build platform ($BUILDPLATFORM) rather than the
7+
# target platform. The frontend output is just static JS/CSS, so it is identical
8+
# across architectures, and building natively avoids running NodeJS under QEMU
9+
# emulation (which crashes with "Illegal instruction" on arm64 targets).
10+
FROM --platform=$BUILDPLATFORM node:22-alpine
611
WORKDIR /app
712
COPY . ./
813
RUN yarn install --frozen-lockfile \

docker-compose.example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
image: redis:alpine
4747
restart: always
4848
panel:
49-
image: ghcr.io/pterodactyl/panel:latest
49+
image: ${PANEL_IMAGE:-ghcr.io/pterodactyl/panel:latest}
5050
restart: always
5151
ports:
5252
- "80:80"

yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4008,15 +4008,10 @@ camelize@^1.0.0:
40084008
resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
40094009
integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
40104010

4011-
caniuse-lite@^1.0.30001335, caniuse-lite@^1.0.30001358:
4012-
version "1.0.30001757"
4013-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz#a46ff91449c69522a462996c6aac4ef95d7ccc5e"
4014-
integrity sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==
4015-
4016-
caniuse-lite@^1.0.30001754, caniuse-lite@^1.0.30001759:
4017-
version "1.0.30001769"
4018-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz#1ad91594fad7dc233777c2781879ab5409f7d9c2"
4019-
integrity sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==
4011+
caniuse-lite@^1.0.30001335, caniuse-lite@^1.0.30001358, caniuse-lite@^1.0.30001754, caniuse-lite@^1.0.30001759:
4012+
version "1.0.30001806"
4013+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz"
4014+
integrity sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==
40204015

40214016
chalk@^2.4.2:
40224017
version "2.4.2"

0 commit comments

Comments
 (0)