1 Commits

Author SHA1 Message Date
Quinten
c2e9695479 add: games_rust with oxide staging support 2024-05-10 10:32:21 +02:00
36 changed files with 89 additions and 45 deletions

View File

@@ -39,5 +39,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/apps:${{ matrix.app }}
ghcr.io/parkervcp/apps:${{ matrix.app }}

View File

@@ -37,5 +37,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:${{ matrix.oses }}
ghcr.io/parkervcp/yolks:${{ matrix.oses }}

View File

@@ -50,7 +50,6 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache-new
push: true
tags: |
ghcr.io/pelican-eggs/yolks:bot_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:bot_${{ matrix.tag }}
- name: Move cache
run: |

View File

@@ -35,5 +35,4 @@ jobs:
platforms: linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:${{ matrix.tag }}
ghcr.io/parkervcp/yolks:${{ matrix.tag }}

View File

@@ -36,5 +36,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:bun_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:bun_${{ matrix.tag }}

View File

@@ -35,5 +35,4 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:cassandra_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:cassandra_${{ matrix.tag }}

View File

@@ -40,5 +40,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:dart_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:dart_${{ matrix.tag }}

View File

@@ -41,5 +41,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:dotnet_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:dotnet_${{ matrix.tag }}

View File

@@ -39,5 +39,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:elixir_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:elixir_${{ matrix.tag }}

View File

@@ -38,5 +38,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:erlang_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:erlang_${{ matrix.tag }}

View File

@@ -24,6 +24,7 @@ jobs:
- source
- valheim
- thebattleforwesnoth
- rust
steps:
- uses: actions/checkout@v4
@@ -42,7 +43,6 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/games:${{ matrix.game }}
ghcr.io/parkervcp/games:${{ matrix.game }}
pushAll:
name: "games_All:${{ matrix.game }}"
@@ -74,5 +74,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/games:${{ matrix.game }}
ghcr.io/parkervcp/games:${{ matrix.game }}

View File

@@ -42,5 +42,4 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:go_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:go_${{ matrix.tag }}

View File

@@ -37,5 +37,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/installers:${{ matrix.tag }}
ghcr.io/parkervcp/installers:${{ matrix.tag }}

View File

@@ -43,5 +43,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:java_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:java_${{ matrix.tag }}

View File

@@ -43,5 +43,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:mariadb_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}

View File

@@ -39,5 +39,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:mongodb_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:mongodb_${{ matrix.tag }}

View File

@@ -34,5 +34,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:mono_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:mono_${{ matrix.tag }}

View File

@@ -43,5 +43,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:nodejs_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:nodejs_${{ matrix.tag }}

View File

@@ -42,5 +42,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:postgres_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:postgres_${{ matrix.tag }}

View File

@@ -42,5 +42,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:python_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:python_${{ matrix.tag }}

View File

@@ -38,5 +38,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:redis_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:redis_${{ matrix.tag }}

View File

@@ -38,5 +38,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:rust_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}

View File

@@ -39,5 +39,4 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/steamcmd:${{ matrix.distro }}
ghcr.io/parkervcp/steamcmd:${{ matrix.distro }}

View File

@@ -34,10 +34,8 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}
pushx64_arm64:
name: "yolks:voice_${{ matrix.tag }}"
runs-on: ubuntu-latest
@@ -66,5 +64,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:voice_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:voice_${{ matrix.tag }}

View File

@@ -36,5 +36,4 @@ jobs:
platforms: linux/amd64
push: true
tags: |
ghcr.io/pelican-eggs/yolks:wine_${{ matrix.tag }}
ghcr.io/parkervcp/yolks:wine_${{ matrix.tag }}

View File

@@ -12,17 +12,17 @@ export INTERNAL_IP
cd /home/container || exit 1
# Print Java version
printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n"
java -version
# Print Python version
if command -v python &> /dev/null
then
printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython --version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython --version\n"
python --version
else
printf "\033[1m\033[33mcontainer@pelican~ \033[0mpython3 --version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mpython3 --version\n"
python3 --version
fi
@@ -33,6 +33,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
exec env ${PARSED}

View File

@@ -9,7 +9,7 @@ export INTERNAL_IP
export DOTNET_ROOT=/usr/share/
# print the dotnet version on startup
printf "\033[1m\033[33mcontainer@pelican~ \033[0mdotnet --version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mdotnet --version\n"
dotnet --version
# Replace Startup Variables

View File

@@ -10,7 +10,7 @@ export INTERNAL_IP
cd /home/container || exit 1
# Print Erlang's version
printf "\033[1m\033[33mcontainer@pelican~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0merl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'\n"
erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'init:stop()'
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
@@ -20,6 +20,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
exec env ${PARSED}

View File

@@ -12,7 +12,7 @@ export INTERNAL_IP
cd /home/container || exit 1
# Print minetest version
printf "\033[1m\033[33mcontainer@pelican~ \033[0mminetest --version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mminetest --version\n"
minetest --version
# Replace Startup Variables

23
games/rust/Dockerfile Normal file
View File

@@ -0,0 +1,23 @@
FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt update \
&& apt upgrade -y \
&& apt install -y lib32gcc-s1 lib32stdc++6 unzip curl iproute2 tzdata libgdiplus libsdl2-2.0-0:i386 tini \
&& useradd -d /home/container -m container
# To-Do add and download new golang wrapper here
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
STOPSIGNAL SIGINT
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

48
games/rust/entrypoint.sh Normal file
View File

@@ -0,0 +1,48 @@
#!/bin/bash
cd /home/container
# Make internal Docker IP address available to processes.
export INTERNAL_IP=`ip route get 1 | awk '{print $(NF-2);exit}'`
## if auto_update is not set or to 1 update
if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then
# Allow for the staging branch to also update itself
./steamcmd/steamcmd.sh +force_install_dir /home/container +login anonymous +app_update 258550 $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) +quit
else
echo -e "Not updating game server as auto update was set to 0. Starting Server"
fi
# Replace Startup Variables
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo ":/home/container$ ${MODIFIED_STARTUP}"
if [[ "${FRAMEWORK}" == "carbon" ]]; then
# Carbon: https://github.com/CarbonCommunity/Carbon.Core
echo "Updating Carbon..."
curl -sSL "https://github.com/CarbonCommunity/Carbon.Core/releases/download/production_build/Carbon.Linux.Release.tar.gz" | tar zx
echo "Done updating Carbon!"
export DOORSTOP_ENABLED=1
export DOORSTOP_TARGET_ASSEMBLY="$(pwd)/carbon/managed/Carbon.Preloader.dll"
MODIFIED_STARTUP="LD_PRELOAD=$(pwd)/libdoorstop.so ${MODIFIED_STARTUP}"
elif [[ "${FRAMEWORK}" == "oxide-staging" ]]; then
echo "updating oxide-staging"
curl -sSL -o oxide-staging.zip "https://downloads.oxidemod.com/artifacts/Oxide.Rust/staging/Oxide.Rust-linux.zip"
unzip -o -q oxide-staging.zip
rm oxide-staging.zip
echo "Done updating oxide Staging"
elif [[ "$OXIDE" == "1" ]] || [[ "${FRAMEWORK}" == "oxide" ]]; then
# Oxide: https://github.com/OxideMod/Oxide.Rust
echo "Updating uMod..."
curl -sSL "https://github.com/OxideMod/Oxide.Rust/releases/latest/download/Oxide.Rust-linux.zip" > umod.zip
unzip -o -q umod.zip
rm umod.zip
echo "Done updating uMod!"
# else Vanilla, do nothing
fi
# Fix for Rust not starting
export LD_LIBRARY_PATH=$(pwd)/RustDedicated_Data/Plugins/x86_64:$(pwd)
# Run the Server
wrapper "${MODIFIED_STARTUP}"

View File

@@ -34,7 +34,7 @@ export INTERNAL_IP
cd /home/container || exit 1
# Print Go version
printf "\033[1m\033[33mcontainer@pelican~ \033[0mgo version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mgo version\n"
go version
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
@@ -44,6 +44,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
exec env ${PARSED}

View File

@@ -34,7 +34,7 @@ export INTERNAL_IP
cd /home/container || exit 1
# Print Java version
printf "\033[1m\033[33mcontainer@pelican~ \033[0mjava -version\n"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n"
java -version
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
@@ -44,6 +44,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
eval ${PARSED}

View File

@@ -38,7 +38,7 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
exec env ${PARSED}

View File

@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc-12-dev libgcc-11-dev libcurl4-gnutls-dev:i386 libssl-dev:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat-traditional tzdata numactl xvfb wget tini libatomic1 libxi6 \
&& apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc-12-dev libgcc-11-dev libcurl4-gnutls-dev:i386 libssl-dev:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat-traditional tzdata numactl xvfb wget tini \
&& useradd -m -d /home/container container
## install rcon

View File

@@ -19,6 +19,6 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
# Display the command we're running in the output, and then execute it with the env
# from the container itself.
printf "\033[1m\033[33mcontainer@pelican~ \033[0m%s\n" "$PARSED"
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
# shellcheck disable=SC2086
exec env ${PARSED}