ARM64 support for the Panel Docker image, closes #3580 (#3709)

Co-authored-by: Dane Everitt <dane@daneeveritt.com>
This commit is contained in:
Alex 2021-12-04 20:33:42 +02:00 committed by GitHub
parent 4cc8658334
commit 49d5ef271d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

View file

@ -36,6 +36,7 @@ jobs:
if: "!contains(github.ref, 'develop')" if: "!contains(github.ref, 'develop')"
with: with:
push: true push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }} tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}
- name: Release Development Build - name: Release Development Build
@ -43,5 +44,6 @@ jobs:
if: "contains(github.ref, 'develop')" if: "contains(github.ref, 'develop')"
with: with:
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker_meta.outputs.tags }} tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}

View file

@ -2,7 +2,7 @@
# Build the assets that are needed for the frontend. This build stage is then discarded # Build the assets that are needed for the frontend. This build stage is then discarded
# since we won't need NodeJS anymore in the future. This Docker image ships a final production # since we won't need NodeJS anymore in the future. This Docker image ships a final production
# level distribution of Pterodactyl. # level distribution of Pterodactyl.
FROM mhart/alpine-node:14 FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
WORKDIR /app WORKDIR /app
COPY . ./ COPY . ./
RUN yarn install --frozen-lockfile \ RUN yarn install --frozen-lockfile \
@ -10,7 +10,7 @@ RUN yarn install --frozen-lockfile \
# Stage 1: # Stage 1:
# Build the actual container with all of the needed PHP dependencies that will run the application. # Build the actual container with all of the needed PHP dependencies that will run the application.
FROM php:7.4-fpm-alpine FROM --platform=$TARGETOS/$TARGETARCH php:7.4-fpm-alpine
WORKDIR /app WORKDIR /app
COPY . ./ COPY . ./
COPY --from=0 /app/public/assets ./public/assets COPY --from=0 /app/public/assets ./public/assets

View file

@ -34,7 +34,7 @@ x-common:
# #
services: services:
database: database:
image: library/mysql:8.0 image: mariadb:10.5
restart: always restart: always
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password
volumes: volumes: