Skip to content

Commit 49d5ef2

Browse files
ARM64 support for the Panel Docker image, closes pterodactyl#3580 (pterodactyl#3709)
Co-authored-by: Dane Everitt <dane@daneeveritt.com>
1 parent 4cc8658 commit 49d5ef2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ jobs:
3636
if: "!contains(github.ref, 'develop')"
3737
with:
3838
push: true
39+
platforms: linux/amd64,linux/arm64
3940
tags: ${{ steps.docker_meta.outputs.tags }}
4041
labels: ${{ steps.docker_meta.outputs.labels }}
4142
- name: Release Development Build
4243
uses: docker/build-push-action@v2
4344
if: "contains(github.ref, 'develop')"
4445
with:
4546
push: ${{ github.event_name != 'pull_request' }}
47+
platforms: linux/amd64,linux/arm64
4648
tags: ${{ steps.docker_meta.outputs.tags }}
4749
labels: ${{ steps.docker_meta.outputs.labels }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
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 mhart/alpine-node:14
5+
FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
66
WORKDIR /app
77
COPY . ./
88
RUN yarn install --frozen-lockfile \
99
&& yarn run build:production
1010

1111
# Stage 1:
1212
# Build the actual container with all of the needed PHP dependencies that will run the application.
13-
FROM php:7.4-fpm-alpine
13+
FROM --platform=$TARGETOS/$TARGETARCH php:7.4-fpm-alpine
1414
WORKDIR /app
1515
COPY . ./
1616
COPY --from=0 /app/public/assets ./public/assets

docker-compose.example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ x-common:
3434
#
3535
services:
3636
database:
37-
image: library/mysql:8.0
37+
image: mariadb:10.5
3838
restart: always
3939
command: --default-authentication-plugin=mysql_native_password
4040
volumes:

0 commit comments

Comments
 (0)