Merge remote-tracking branch 'upstream/master'
This commit is contained in:
3
.github/workflows/base.yml
vendored
3
.github/workflows/base.yml
vendored
@@ -21,6 +21,7 @@ jobs:
|
||||
- ubuntu
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: docker/setup-qemu-action@v1
|
||||
- uses: docker/setup-buildx-action@v1
|
||||
with:
|
||||
version: "v0.5.1"
|
||||
@@ -34,7 +35,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/parkervcp/yolks:${{ matrix.oses }}
|
||||
|
44
.github/workflows/mariadb.yml
vendored
Normal file
44
.github/workflows/mariadb.yml
vendored
Normal file
@@ -0,0 +1,44 @@
|
||||
name: build mariadb
|
||||
on:
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: "0 0 * * 1"
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- mariadb/**
|
||||
jobs:
|
||||
push:
|
||||
name: "yolks:mariadb_${{ matrix.tag }}"
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
tag:
|
||||
- '10.3'
|
||||
- '10.4'
|
||||
- '10.5'
|
||||
- '10.6'
|
||||
- '10.7'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: docker/setup-qemu-action@v1
|
||||
- uses: docker/setup-buildx-action@v1
|
||||
with:
|
||||
version: "v0.5.1"
|
||||
buildkitd-flags: --debug
|
||||
- uses: docker/login-action@v1
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||
- uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: ./mariadb
|
||||
file: ./mariadb/${{ matrix.tag }}/Dockerfile
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}
|
13
README.md
13
README.md
@@ -106,8 +106,19 @@ is tagged correctly.
|
||||
* [`java17`](/java/17)
|
||||
* `ghcr.io/parkervcp/yolks:java_17`
|
||||
|
||||
### [Mono](/mono)
|
||||
### [MariaDB](/mariadb)
|
||||
* [`MariaDB 10.3`](/mariadb/10.3)
|
||||
* `ghcr.io/parkervcp/yolks:mariadb_10.3`
|
||||
* [`MariaDB 10.4`](/mariadb/10.4)
|
||||
* `ghcr.io/parkervcp/yolks:mariadb_10.4`
|
||||
* [`MariaDB 10.5`](/mariadb/10.5)
|
||||
* `ghcr.io/parkervcp/yolks:mariadb_10.5`
|
||||
* [`MariaDB 10.6`](/mariadb/10.6)
|
||||
* `ghcr.io/parkervcp/yolks:mariadb_10.6`
|
||||
* [`MariaDB 10.7`](/mariadb/10.7)
|
||||
* `ghcr.io/parkervcp/yolks:mariadb_10.7`
|
||||
|
||||
### [Mono](/mono)
|
||||
* [`mono_latest`](/mono/latest)
|
||||
* `ghcr.io/parkervcp/yolks:mono_latest`
|
||||
|
||||
|
19
mariadb/10.3/Dockerfile
Normal file
19
mariadb/10.3/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
||||
# -----------------------------------------------------
|
||||
# MariaDB Image for Pterodactyl
|
||||
# -----------------------------------------------------
|
||||
FROM mariadb:10.3
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt install -y netcat \
|
||||
&& useradd -d /home/container -m container -s /bin/bash
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
19
mariadb/10.4/Dockerfile
Normal file
19
mariadb/10.4/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
||||
# -----------------------------------------------------
|
||||
# MariaDB Image for Pterodactyl
|
||||
# -----------------------------------------------------
|
||||
FROM mariadb:10.4
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt install -y netcat \
|
||||
&& useradd -d /home/container -m container -s /bin/bash
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
19
mariadb/10.5/Dockerfile
Normal file
19
mariadb/10.5/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
||||
# -----------------------------------------------------
|
||||
# MariaDB Image for Pterodactyl
|
||||
# -----------------------------------------------------
|
||||
FROM mariadb:10.5
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt install -y netcat \
|
||||
&& useradd -d /home/container -m container -s /bin/bash
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
19
mariadb/10.6/Dockerfile
Normal file
19
mariadb/10.6/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
||||
# -----------------------------------------------------
|
||||
# MariaDB Image for Pterodactyl
|
||||
# -----------------------------------------------------
|
||||
FROM mariadb:10.6
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt install -y netcat \
|
||||
&& useradd -d /home/container -m container -s /bin/bash
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
19
mariadb/10.7/Dockerfile
Normal file
19
mariadb/10.7/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
||||
# -----------------------------------------------------
|
||||
# MariaDB Image for Pterodactyl
|
||||
# -----------------------------------------------------
|
||||
FROM mariadb:10.7
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt install -y netcat \
|
||||
&& useradd -d /home/container -m container -s /bin/bash
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
12
mariadb/entrypoint.sh
Normal file
12
mariadb/entrypoint.sh
Normal file
@@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
echo ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
@@ -1,7 +1,3 @@
|
||||
# ----------------------------------
|
||||
# Mono Latest Image
|
||||
# Minimum Panel Version: 1.2.x
|
||||
# ----------------------------------
|
||||
FROM ghcr.io/parkervcp/yolks:debian
|
||||
|
||||
LABEL author="Torsten Widmann" maintainer="support@goover.de"
|
||||
@@ -12,11 +8,11 @@ RUN apt install -y fontconfig dirmngr
|
||||
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
|
||||
RUN sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list'
|
||||
RUN apt update
|
||||
RUN apt install mono-complete -y
|
||||
RUN apt install -y mono-complete lib32gcc-s1
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
||||
|
@@ -20,7 +20,7 @@
|
||||
# SOFTWARE.
|
||||
#
|
||||
|
||||
FROM --platform=$BUILDPLATFORM alpine:latest
|
||||
FROM --platform=$TARGETOS/$TARGETARCH alpine:latest
|
||||
|
||||
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
FROM debian:bullseye-slim
|
||||
FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
@@ -18,7 +18,7 @@ RUN apt update \
|
||||
&& apt upgrade -y
|
||||
|
||||
## Install dependencies
|
||||
RUN apt install -y gcc g++ libgcc1 lib32gcc-s1 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 \
|
||||
RUN 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 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \
|
||||
liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:18.04
|
||||
FROM --platform=$TARGETOS/$TARGETARCH ubuntu:18.04
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
@@ -12,7 +12,7 @@ RUN apt update \
|
||||
&& apt upgrade -y
|
||||
|
||||
## install dependencies
|
||||
RUN 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 \
|
||||
RUN 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 libicu60 libiculx60 icu-devtools libunwind8 libssl1.0.0 libssl1.0-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape202 libzip4 locales ffmpeg apt-transport-https init-system-helpers \
|
||||
libcurl3-gnutls libjsoncpp1 libleveldb1v5 liblua5.1-0 libluajit-5.1-2 libsqlite3-0 libfluidsynth1 bzip2 zlib1g libevent-dev
|
||||
|
||||
@@ -23,4 +23,4 @@ RUN update-locale lang=en_US.UTF-8 \
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
||||
|
Reference in New Issue
Block a user