Fixes for arm64 and Debian Bullseye (#18)

* Build installers and base images for arm64
* Update sqlite to sqlite3 for Debian 11 (bullseye)
This commit is contained in:
marte26 2021-09-22 15:01:08 +02:00 committed by GitHub
parent 4f55fd09d9
commit 7edc8b6f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 10 deletions

View file

@ -19,6 +19,7 @@ jobs:
- debian
steps:
- uses: actions/checkout@v2
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
with:
version: "v0.5.1"
@ -32,7 +33,7 @@ jobs:
with:
context: ./oses/${{ matrix.oses }}
file: ./oses/${{ matrix.oses }}/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pterodactyl/yolks:${{ matrix.oses }}

View file

@ -19,6 +19,7 @@ jobs:
- debian
steps:
- uses: actions/checkout@v2
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
with:
version: "v0.5.1"
@ -32,7 +33,7 @@ jobs:
with:
context: ./installers
file: ./installers/${{ matrix.tag }}/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pterodactyl/installers:${{ matrix.tag }}

View file

@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -20,7 +20,7 @@
# SOFTWARE.
#
FROM --platform=$BUILDPLATFORM openjdk:8-slim-buster
FROM --platform=$BUILDPLATFORM openjdk:8-slim
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -28,7 +28,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
&& useradd -d /home/container -m container
USER container

View file

@ -1,4 +1,4 @@
FROM --platform=linux/amd64 debian:buster-slim
FROM --platform=$BUILDPLATFORM debian:buster-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"