Fix installers and OS build (#35)
Co-authored-by: softwarenoob <admin@softwarenoob.com>
This commit is contained in:
parent
9c9a26669e
commit
18b25caaf8
8 changed files with 78 additions and 45 deletions
12
.github/workflows/base.yml
vendored
12
.github/workflows/base.yml
vendored
|
@ -19,18 +19,18 @@ jobs:
|
||||||
- alpine
|
- alpine
|
||||||
- debian
|
- debian
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-qemu-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./oses/${{ matrix.oses }}
|
context: ./oses/${{ matrix.oses }}
|
||||||
file: ./oses/${{ matrix.oses }}/Dockerfile
|
file: ./oses/${{ matrix.oses }}/Dockerfile
|
||||||
|
|
10
.github/workflows/games.yml
vendored
10
.github/workflows/games.yml
vendored
|
@ -19,17 +19,17 @@ jobs:
|
||||||
- source
|
- source
|
||||||
- rust
|
- rust
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./games/${{ matrix.game }}
|
context: ./games/${{ matrix.game }}
|
||||||
file: ./games/${{ matrix.game }}/Dockerfile
|
file: ./games/${{ matrix.game }}/Dockerfile
|
||||||
|
|
12
.github/workflows/go.yml
vendored
12
.github/workflows/go.yml
vendored
|
@ -21,19 +21,19 @@ jobs:
|
||||||
- 1.16
|
- 1.16
|
||||||
- 1.17
|
- 1.17
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
# Setup QEMU for ARM64 Build
|
# Setup QEMU for ARM64 Build
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-qemu-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./go
|
context: ./go
|
||||||
file: ./go/${{ matrix.tag }}/Dockerfile
|
file: ./go/${{ matrix.tag }}/Dockerfile
|
||||||
|
|
51
.github/workflows/installers.yml
vendored
51
.github/workflows/installers.yml
vendored
|
@ -8,29 +8,34 @@ on:
|
||||||
- master
|
- master
|
||||||
paths:
|
paths:
|
||||||
- installers/**
|
- installers/**
|
||||||
|
|
||||||
|
# Two separate jobs, first for multiarch (amd64, arm64), second for amd64 only
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
push:
|
pushMultiArch:
|
||||||
name: "installers:{{ matrix.tag }}"
|
name: "yolks:installers_multiarch:${{ matrix.tag }}"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
tag:
|
tag:
|
||||||
- alpine
|
- alpine
|
||||||
- debian
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- name: Setup QEMU for multiarch builds
|
||||||
|
uses: docker/setup-qemu-action@v2
|
||||||
|
with:
|
||||||
|
platforms: arm64,amd64
|
||||||
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./installers
|
context: ./installers
|
||||||
file: ./installers/${{ matrix.tag }}/Dockerfile
|
file: ./installers/${{ matrix.tag }}/Dockerfile
|
||||||
|
@ -38,3 +43,31 @@ jobs:
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/pterodactyl/installers:${{ matrix.tag }}
|
ghcr.io/pterodactyl/installers:${{ matrix.tag }}
|
||||||
|
|
||||||
|
pushAmd:
|
||||||
|
name: "yolks:installers_amd:${{ matrix.tag }}"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
tag:
|
||||||
|
- debian
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: docker/setup-buildx-action@v2
|
||||||
|
with:
|
||||||
|
version: "v0.7.0"
|
||||||
|
buildkitd-flags: --debug
|
||||||
|
- uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
|
- uses: docker/build-push-action@v3
|
||||||
|
with:
|
||||||
|
context: ./installers
|
||||||
|
file: ./installers/${{ matrix.tag }}/Dockerfile
|
||||||
|
platforms: linux/amd64
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
ghcr.io/pterodactyl/installers:${{ matrix.tag }}
|
||||||
|
|
12
.github/workflows/java.yml
vendored
12
.github/workflows/java.yml
vendored
|
@ -26,18 +26,18 @@ jobs:
|
||||||
- 18
|
- 18
|
||||||
- 18j9
|
- 18j9
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-qemu-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./java
|
context: ./java
|
||||||
file: ./java/${{ matrix.tag }}/Dockerfile
|
file: ./java/${{ matrix.tag }}/Dockerfile
|
||||||
|
|
12
.github/workflows/nodejs.yml
vendored
12
.github/workflows/nodejs.yml
vendored
|
@ -23,19 +23,19 @@ jobs:
|
||||||
- 17
|
- 17
|
||||||
- 18
|
- 18
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
# Setup QEMU for ARM64 Build
|
# Setup QEMU for ARM64 Build
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-qemu-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./nodejs
|
context: ./nodejs
|
||||||
file: ./nodejs/${{ matrix.tag }}/Dockerfile
|
file: ./nodejs/${{ matrix.tag }}/Dockerfile
|
||||||
|
|
12
.github/workflows/python.yml
vendored
12
.github/workflows/python.yml
vendored
|
@ -22,19 +22,19 @@ jobs:
|
||||||
- '3.10'
|
- '3.10'
|
||||||
- '3.11'
|
- '3.11'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
# Setup QEMU for ARM64 Build
|
# Setup QEMU for ARM64 Build
|
||||||
- uses: docker/setup-qemu-action@v1
|
- uses: docker/setup-qemu-action@v2
|
||||||
- uses: docker/setup-buildx-action@v1
|
- uses: docker/setup-buildx-action@v2
|
||||||
with:
|
with:
|
||||||
version: "v0.5.1"
|
version: "v0.9.1"
|
||||||
buildkitd-flags: --debug
|
buildkitd-flags: --debug
|
||||||
- uses: docker/login-action@v1
|
- uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
- uses: docker/build-push-action@v2
|
- uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
context: ./python
|
context: ./python
|
||||||
file: ./python/${{ matrix.tag }}/Dockerfile
|
file: ./python/${{ matrix.tag }}/Dockerfile
|
||||||
|
|
|
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
|
||||||
LABEL org.opencontainers.image.licenses=MIT
|
LABEL org.opencontainers.image.licenses=MIT
|
||||||
|
|
||||||
RUN apt update && apt upgrade -y \
|
RUN apt update && apt upgrade -y \
|
||||||
&& apt install -y gcc g++ libgcc1 lib32gcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
|
&& apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
|
||||||
libfontconfig libicu63 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape203 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
|
libfontconfig libicu63 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape203 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
|
||||||
liblua5.3 libz-dev rapidjson-dev \
|
liblua5.3 libz-dev rapidjson-dev \
|
||||||
&& update-locale lang=en_US.UTF-8 \
|
&& update-locale lang=en_US.UTF-8 \
|
||||||
|
|
Loading…
Reference in a new issue