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:
parent
4f55fd09d9
commit
7edc8b6f04
9 changed files with 12 additions and 10 deletions
3
.github/workflows/base.yml
vendored
3
.github/workflows/base.yml
vendored
|
@ -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 }}
|
||||
|
|
3
.github/workflows/installers.yml
vendored
3
.github/workflows/installers.yml
vendored
|
@ -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 }}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in a new issue