Merge remote-tracking branch 'origin/master' into mohaa
This commit is contained in:
2
.github/workflows/games.yml
vendored
2
.github/workflows/games.yml
vendored
@@ -19,7 +19,9 @@ jobs:
|
||||
- altv
|
||||
- arma3
|
||||
- mohaa
|
||||
- samp
|
||||
- source
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: docker/setup-buildx-action@v1
|
||||
|
1
.github/workflows/nodejs.yml
vendored
1
.github/workflows/nodejs.yml
vendored
@@ -20,6 +20,7 @@ jobs:
|
||||
- 14
|
||||
- 16
|
||||
- 17
|
||||
- 18
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
# Setup QEMU for ARM64 Build
|
||||
|
43
.github/workflows/rust.yml
vendored
Normal file
43
.github/workflows/rust.yml
vendored
Normal file
@@ -0,0 +1,43 @@
|
||||
name: build rust
|
||||
on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: "0 0 * * 1"
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- rust/**
|
||||
jobs:
|
||||
push:
|
||||
name: "yolks:rust_${{ matrix.tag }}"
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
tag:
|
||||
- '1.31'
|
||||
- '1.56'
|
||||
- '1.60'
|
||||
- 'latest'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
# Setup QEMU for ARM64 Build
|
||||
- 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: ./rust
|
||||
file: ./rust/${{ matrix.tag }}/Dockerfile
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}
|
16
README.md
16
README.md
@@ -81,9 +81,12 @@ is tagged correctly.
|
||||
* `ghcr.io/parkervcp/games:arma3`
|
||||
* [`mohaa`](games/mohaa)
|
||||
* `ghcr.io/pterodactyl/games:mohaa`
|
||||
* [`samp`](/games/samp)
|
||||
* `ghcr.io/parkervcp/games:samp`
|
||||
* [`source`](/games/source)
|
||||
* `ghcr.io/parkervcp/games:source`
|
||||
|
||||
|
||||
### [Golang](/go)
|
||||
|
||||
* [`go1.14`](/go/1.14)
|
||||
@@ -142,6 +145,8 @@ is tagged correctly.
|
||||
* `ghcr.io/parkervcp/yolks:nodejs_16`
|
||||
* [`node17`](/nodejs/17)
|
||||
* `ghcr.io/parkervcp/yolks:nodejs_17`
|
||||
* [`node18`](/nodejs/18)
|
||||
* `ghcr.io/parkervcp/yolks:nodejs_18`
|
||||
|
||||
### [PostgreSQL](/postgres)
|
||||
* [`Postgres 9`](/postgres/9)
|
||||
@@ -174,6 +179,17 @@ is tagged correctly.
|
||||
* [`Redis 6`](/redis/6)
|
||||
* `ghcr.io/parkervcp/yolks:redis_6`
|
||||
|
||||
### [Rust](/rust)
|
||||
|
||||
* ['rust1.31'](/rust/1.31)
|
||||
* `ghcr.io/parkervcp/yolks:rust_1.31`
|
||||
* ['rust1.56'](/rust/1.56)
|
||||
* `ghcr.io/parkervcp/yolks:rust_1.56`
|
||||
* ['rust1.60'](/rust/1.60)
|
||||
* `ghcr.io/parkervcp/yolks:rust_1.60`
|
||||
* ['rust latest'](/rust/latest)
|
||||
* `ghcr.io/parkervcp/yolks:rust_latest`
|
||||
|
||||
### [Voice](/voice)
|
||||
|
||||
* [`TeaSpeak`](/teaspeak)
|
||||
|
@@ -1,8 +1,9 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
|
||||
|
@@ -1,8 +1,9 @@
|
||||
#!/bin/ash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
|
||||
|
@@ -1,12 +1,13 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
||||
eval ${MODIFIED_STARTUP}
|
||||
|
@@ -1,8 +1,9 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
|
||||
|
@@ -5,7 +5,7 @@ TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -1,8 +1,9 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
|
@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -11,7 +11,7 @@ RUN useradd -m -d /home/container -s /bin/bash container
|
||||
|
||||
RUN apt update -y \
|
||||
&& apt upgrade -y \
|
||||
&& apt install -y gcc g++ libgcc-s1 lib32gcc-s1 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 g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 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 \
|
||||
libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
|
||||
python3 dnsutils build-essential coreutils jq pcregrep
|
||||
|
||||
|
@@ -1,12 +1,13 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
||||
eval ${MODIFIED_STARTUP}
|
||||
|
@@ -11,7 +11,7 @@ RUN dpkg --add-architecture i386 \
|
||||
&& apt-get update \
|
||||
&& apt-get upgrade -y \
|
||||
&& apt-get install -y libgcc-10-dev libstdc++-10-dev libtinfo5 lib64z1 libcurl3-gnutls \
|
||||
&& apt-get install -y libnss-wrapper gettext-base tar curl gcc g++ libc6 libtbb2 lib32z1 lib32gcc1 lib32stdc++6 libsdl2-2.0-0 libsdl2-2.0-0:i386 libtbb2:i386 lib32stdc++6 libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 \
|
||||
&& apt-get install -y libnss-wrapper gettext-base tar curl gcc g++ libc6 libtbb2 lib32z1 lib32gcc1 lib32stdc++6 libsdl2-2.0-0 libsdl2-2.0-0:i386 libtbb2:i386 lib32stdc++6 libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 tzdata \
|
||||
&& useradd -m -d /home/container -s /bin/bash container \
|
||||
&& touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
|
||||
&& chgrp 0 ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
|
||||
|
@@ -20,7 +20,7 @@ RED='\033[0;31m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
## === ENVIRONMENT VARS ===
|
||||
# STARTUP, STARTUP_PARAMS, STEAM_USER, STEAM_PASS, SERVER_BINARY, MOD_FILE, MODIFICATIONS, SERVERMODS, UPDATE_SERVER, CLEAR_CACHE, VALIDATE_SERVER, MODS_LOWERCASE, STEAMCMD_EXTRA_FLAGS, CDLC, STEAMCMD_APPID, HC_NUM, SERVER_PASSWORD, HC_HIDE, STEAMCMD_ATTEMPTS, BASIC_URL, DISABLE_MOD_UPDATES
|
||||
# STARTUP, STARTUP_PARAMS, STEAM_USER, STEAM_PASS, SERVER_BINARY, MOD_FILE, MODIFICATIONS, SERVERMODS, OPTIONALMODS, UPDATE_SERVER, CLEAR_CACHE, VALIDATE_SERVER, MODS_LOWERCASE, STEAMCMD_EXTRA_FLAGS, CDLC, STEAMCMD_APPID, HC_NUM, SERVER_PASSWORD, HC_HIDE, STEAMCMD_ATTEMPTS, BASIC_URL, DISABLE_MOD_UPDATES
|
||||
|
||||
## === GLOBAL VARS ===
|
||||
# validateServer, extraFlags, updateAttempt, modifiedStartup, allMods, CLIENT_MODS
|
||||
@@ -28,29 +28,29 @@ NC='\033[0m' # No Color
|
||||
## === DEFINE FUNCTIONS ===
|
||||
#
|
||||
# Runs SteamCMD with specified variables and performs error handling.
|
||||
function RunSteamCMD { #[Input: int server=0 mod=1; int id]
|
||||
function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
|
||||
# Clear previous SteamCMD log
|
||||
if [[ -f "${STEAMCMD_LOG}" ]]; then
|
||||
rm -f "${STEAMCMD_LOG:?}"
|
||||
fi
|
||||
|
||||
|
||||
updateAttempt=0
|
||||
while (( $updateAttempt < $STEAMCMD_ATTEMPTS )); do # Loop for specified number of attempts
|
||||
# Increment attempt counter
|
||||
updateAttempt=$((updateAttempt+1))
|
||||
|
||||
|
||||
if (( $updateAttempt > 1 )); then # Notify if not first attempt
|
||||
echo -e "\t${YELLOW}Re-Attempting download/update in 3 seconds...${NC} (Attempt ${CYAN}${updateAttempt}${NC} of ${CYAN}${STEAMCMD_ATTEMPTS}${NC})\n"
|
||||
sleep 3
|
||||
fi
|
||||
|
||||
|
||||
# Check if updating server or mod
|
||||
if [[ $1 == 0 ]]; then # Server
|
||||
${STEAMCMD_DIR}/steamcmd.sh +force_install_dir /home/container "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +app_update $2 $extraFlags $validateServer +quit | tee -a "${STEAMCMD_LOG}"
|
||||
else # Mod
|
||||
${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}"
|
||||
fi
|
||||
|
||||
|
||||
# Error checking for SteamCMD
|
||||
steamcmdExitCode=${PIPESTATUS[0]}
|
||||
if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL") ]]; then # Catch errors (ignore setlocale and SDL warnings)
|
||||
@@ -110,7 +110,23 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id]
|
||||
ModsLowercase @$2
|
||||
# Move any .bikey's to the keys directory
|
||||
echo -e "\tMoving any mod ${CYAN}.bikey${NC} files to the ${CYAN}~/keys/${NC} folder..."
|
||||
find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \;
|
||||
if [[ $1 == 1 ]]; then
|
||||
find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \;
|
||||
else
|
||||
# Give optional mod keys a custom name which can be checked later for deleting unconfigured mods
|
||||
for file in $(find ./@$2 -name "*.bikey" -type f); do
|
||||
filename=$(basename ${file})
|
||||
|
||||
cp $file ./keys/optional_$2_${filename}
|
||||
|
||||
done;
|
||||
|
||||
echo -e "\tMod with ID $2 is an optional mod. Deleting original mod download folder..."
|
||||
rm -r ./@$2
|
||||
|
||||
# Recreate a directory so time-based detection of auto updates works correctly
|
||||
mkdir ./@$2_optional
|
||||
fi
|
||||
echo -e "${GREEN}[UPDATE]: Mod download/update successful!${NC}"
|
||||
fi
|
||||
break
|
||||
@@ -150,6 +166,11 @@ function RemoveDuplicates { #[Input: str - Output: printf of new str]
|
||||
}
|
||||
|
||||
# === ENTRYPOINT START ===
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
cd /home/container
|
||||
sleep 1
|
||||
|
||||
@@ -183,6 +204,11 @@ if [[ -n ${SERVERMODS} ]] && [[ ${SERVERMODS} != *\; ]]; then # Add server mods
|
||||
else
|
||||
allMods=${SERVERMODS}
|
||||
fi
|
||||
if [[ -n ${OPTIONALMODS} ]] && [[ ${OPTIONALMODS} != *\; ]]; then # Add specified optional mods to the mods list, while checking for trailing semicolon
|
||||
allMods+="${OPTIONALMODS};"
|
||||
else
|
||||
allMods+=${OPTIONALMODS}
|
||||
fi
|
||||
allMods+=$CLIENT_MODS # Add all client-side mods to the master mod list
|
||||
CLIENT_MODS=$(RemoveDuplicates ${CLIENT_MODS}) # Remove duplicate mods from CLIENT_MODS, if present
|
||||
allMods=$(RemoveDuplicates ${allMods}) # Remove duplicate mods from allMods, if present
|
||||
@@ -192,17 +218,17 @@ allMods=$(echo $allMods | sed -e 's/;/ /g') # Convert from string to array
|
||||
if [[ ${UPDATE_SERVER} == 1 ]]; then
|
||||
echo -e "\n${GREEN}[STARTUP]: ${CYAN}Starting checks for all updates...${NC}"
|
||||
echo -e "(It is okay to ignore any \"SDL\" errors during this process)\n"
|
||||
|
||||
|
||||
## Update game server
|
||||
echo -e "${GREEN}[UPDATE]:${NC} Checking for game server updates with App ID: ${CYAN}${STEAMCMD_APPID}${NC}..."
|
||||
|
||||
|
||||
if [[ ${VALIDATE_SERVER} == 1 ]]; then # Validate will be added as a parameter if specified
|
||||
echo -e "\t${CYAN}File validation enabled.${NC} (This may take extra time to complete)"
|
||||
validateServer="validate"
|
||||
else
|
||||
validateServer=""
|
||||
fi
|
||||
|
||||
|
||||
# Determine what extra flags should be set
|
||||
if [[ -n ${STEAMCMD_EXTRA_FLAGS} ]]; then
|
||||
echo -e "\t(${YELLOW}Advanced${NC}) Extra SteamCMD flags specified: ${CYAN}${STEAMCMD_EXTRA_FLAGS}${NC}\n"
|
||||
@@ -214,25 +240,37 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
|
||||
echo -e ""
|
||||
extraFlags=""
|
||||
fi
|
||||
|
||||
|
||||
RunSteamCMD 0 ${STEAMCMD_APPID}
|
||||
|
||||
|
||||
## Update mods
|
||||
if [[ -n $allMods ]] && [[ ${DISABLE_MOD_UPDATES} != 1 ]]; then
|
||||
echo -e "\n${GREEN}[UPDATE]:${NC} Checking all ${CYAN}Steam Workshop mods${NC} for updates..."
|
||||
for modID in $(echo $allMods | sed -e 's/@//g')
|
||||
do
|
||||
if [[ $modID =~ ^[0-9]+$ ]]; then # Only check mods that are in ID-form
|
||||
# If a mod is defined in OPTIONALMODS, and is not defined in CLIENT_MODS or SERVERMODS, then treat as an optional mod
|
||||
# Optional mods are given a different directory which is checked to see if a new update is available. This is to ensure
|
||||
# if an optional mod is switched to be a standard client-side mod, this script will redownload the mod
|
||||
if [[ "${OPTIONALMODS}" == *"@${modID};"* ]] && [[ "${CLIENT_MODS}" != *"@${modID};"* ]] && [[ "${SERVERMODS}" != *"@${modID};"* ]]; then
|
||||
modType=2
|
||||
modDir=@${modID}_optional
|
||||
else
|
||||
modType=1
|
||||
modDir=@${modID}
|
||||
fi
|
||||
|
||||
# Get mod's latest update in epoch time from its Steam Workshop changelog page
|
||||
latestUpdate=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep '<p id=' | head -1 | cut -d'"' -f2)
|
||||
|
||||
# If the update time is valid and newer than the local directory's creation date, or the mod hasn't been downloaded yet, download the mod
|
||||
if [[ ! -d @$modID ]] || [[ ( -n $latestUpdate ) && ( $latestUpdate =~ ^[0-9]+$ ) && ( $latestUpdate > $(find @$modID | head -1 | xargs stat -c%Y) ) ]]; then
|
||||
if [[ ! -d $modDir ]] || [[ ( -n $latestUpdate ) && ( $latestUpdate =~ ^[0-9]+$ ) && ( $latestUpdate > $(find $modDir | head -1 | xargs stat -c%Y) ) ]]; then
|
||||
# Get the mod's name from the Workshop page as well
|
||||
modName=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep 'workshopItemTitle' | cut -d'>' -f2 | cut -d'<' -f1)
|
||||
if [[ -z $modName ]]; then # Set default name if unavailable
|
||||
modName="[NAME UNAVAILABLE]"
|
||||
fi
|
||||
if [[ ! -d @$modID ]]; then
|
||||
if [[ ! -d $modDir ]]; then
|
||||
echo -e "\n${GREEN}[UPDATE]:${NC} Downloading new Mod: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
|
||||
else
|
||||
echo -e "\n${GREEN}[UPDATE]:${NC} Mod update found for: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
|
||||
@@ -241,10 +279,38 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
|
||||
echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}"
|
||||
fi
|
||||
echo -e "\tAttempting mod update/download via SteamCMD...\n"
|
||||
RunSteamCMD 1 $modID
|
||||
|
||||
RunSteamCMD $modType $modID
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Check over key files for unconfigured optional mods' .bikey files
|
||||
for keyFile in $(find ./keys -name "*.bikey" -type f); do
|
||||
keyFileName=$(basename ${keyFile})
|
||||
|
||||
# If the key file is using the optional mod file name
|
||||
if [[ "${keyFileName}" == "optional_"* ]]; then
|
||||
modID=$(echo "${keyFileName}" | cut -d _ -f 2)
|
||||
|
||||
# If mod is not in optional mods, delete it
|
||||
# If a mod is configured in CLIENT_MODS or SERVERMODS, we should still delete this file
|
||||
# as a new file will have been copied that does not follow the naming scheme
|
||||
if [[ "${OPTIONALMODS}" != *"@${modID};"* ]]; then
|
||||
|
||||
# We only need to let the user know the key file is being deleted if this mod is no longer configured at all.
|
||||
# If CLIENT_MODS contains the mod ID, we'd just confuse the user by telling them we are deleting the optional .bikey file
|
||||
if [[ "${CLIENT_MODS}" != *"@${modID};"* ]]; then
|
||||
echo -e "\tKey file and directory for unconfigured optional mod ${CYAN}${modID}${NC} is being deleted..."
|
||||
fi
|
||||
|
||||
# Delete the optional mod .bikey file and directory
|
||||
rm ${keyFile}
|
||||
rmdir ./@${modID}_optional 2> /dev/null
|
||||
fi
|
||||
fi
|
||||
done;
|
||||
|
||||
echo -e "${GREEN}[UPDATE]:${NC} Steam Workshop mod update check ${GREEN}complete${NC}!"
|
||||
fi
|
||||
fi
|
||||
|
23
games/samp/Dockerfile
Normal file
23
games/samp/Dockerfile
Normal file
@@ -0,0 +1,23 @@
|
||||
FROM --platform=$BUILDPLATFORM debian:bullseye-slim
|
||||
|
||||
LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y upgrade
|
||||
RUN dpkg --add-architecture i386 \
|
||||
&& apt update \
|
||||
&& apt upgrade -y \
|
||||
&& apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip \
|
||||
&& apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386 \
|
||||
&& useradd -d /home/container -m container
|
||||
|
||||
RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
|
||||
RUN rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
12
games/samp/entrypoint.sh
Normal file
12
games/samp/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-2);exit}'`
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
@@ -30,7 +30,7 @@ TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -20,14 +20,14 @@
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
#
|
||||
#
|
||||
|
||||
# Default the TZ environment variable to UTC.
|
||||
TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -27,7 +27,7 @@ TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -15,5 +15,5 @@ USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -15,5 +15,5 @@ USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -15,5 +15,5 @@ USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -15,5 +15,5 @@ USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -15,5 +15,5 @@ USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')"
|
||||
|
15
nodejs/18/Dockerfile
Normal file
15
nodejs/18/Dockerfile
Normal file
@@ -0,0 +1,15 @@
|
||||
FROM --platform=$TARGETOS/$TARGETARCH node:18-bullseye-slim
|
||||
|
||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \
|
||||
&& npm -g install npm@latest \
|
||||
&& useradd -m -d /home/container container
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./../entrypoint.sh /entrypoint.sh
|
||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Print Node.js Version
|
||||
node -v
|
||||
|
@@ -18,14 +18,14 @@
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
#
|
||||
#
|
||||
|
||||
# Default the TZ environment variable to UTC.
|
||||
TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -1,12 +1,13 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
# Make internal Docker IP address available to processes.
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
||||
eval ${MODIFIED_STARTUP}
|
||||
|
@@ -2,11 +2,12 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
||||
eval ${MODIFIED_STARTUP}
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -12,5 +12,5 @@ USER container
|
||||
ENV HOME /home/container
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./entrypoint.sh /entrypoint.sh
|
||||
COPY ../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
||||
|
@@ -5,7 +5,8 @@ cd /home/container
|
||||
postgres --version
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
|
||||
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Print current Python version
|
||||
python --version
|
||||
|
@@ -2,7 +2,8 @@
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
|
||||
|
14
rust/1.31/Dockerfile
Normal file
14
rust/1.31/Dockerfile
Normal file
@@ -0,0 +1,14 @@
|
||||
FROM --platform=$TARGETOS/$TARGETARCH rust:1.31-slim
|
||||
|
||||
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y install git dnsutils curl iproute2 ffmpeg \
|
||||
&& useradd -m -d /home/container container
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
14
rust/1.56/Dockerfile
Normal file
14
rust/1.56/Dockerfile
Normal file
@@ -0,0 +1,14 @@
|
||||
FROM --platform=$TARGETOS/$TARGETARCH rust:1.56-slim
|
||||
|
||||
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y install git dnsutils curl iproute2 ffmpeg \
|
||||
&& useradd -m -d /home/container container
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
14
rust/1.60/Dockerfile
Normal file
14
rust/1.60/Dockerfile
Normal file
@@ -0,0 +1,14 @@
|
||||
FROM --platform=$TARGETOS/$TARGETARCH rust:1.60-slim
|
||||
|
||||
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y install git dnsutils curl iproute2 ffmpeg \
|
||||
&& useradd -m -d /home/container container
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
16
rust/entrypoint.sh
Normal file
16
rust/entrypoint.sh
Normal file
@@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
cd /home/container
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Print current Rust version
|
||||
cargo --version
|
||||
|
||||
# Replace Startup Variables
|
||||
MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
|
||||
echo -e ":/home/container$ ${MODIFIED_STARTUP}"
|
||||
|
||||
# Run the Server
|
||||
eval ${MODIFIED_STARTUP}
|
14
rust/latest/Dockerfile
Normal file
14
rust/latest/Dockerfile
Normal file
@@ -0,0 +1,14 @@
|
||||
FROM --platform=$TARGETOS/$TARGETARCH rust:slim
|
||||
|
||||
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
|
||||
|
||||
RUN apt update \
|
||||
&& apt -y install git dnsutils curl iproute2 ffmpeg \
|
||||
&& useradd -m -d /home/container container
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
|
||||
WORKDIR /home/container
|
||||
|
||||
COPY ./../entrypoint.sh /entrypoint.sh
|
||||
CMD ["/bin/bash", "/entrypoint.sh"]
|
@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
|
||||
export TZ
|
||||
|
||||
# Set environment variable that holds the Internal Docker IP
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# Switch to the container's working directory
|
||||
|
@@ -7,7 +7,8 @@ echo "Current timezone: $(cat /etc/timezone)"
|
||||
wine --version
|
||||
|
||||
# Make internal Docker IP address available to processes.
|
||||
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
## just in case someone removed the defaults.
|
||||
if [ "${STEAM_USER}" == "" ]; then
|
||||
@@ -64,7 +65,7 @@ if [[ $WINETRICKS_RUN =~ mono ]]; then
|
||||
WINETRICKS_RUN=${WINETRICKS_RUN/mono}
|
||||
|
||||
if [ ! -f "$WINEPREFIX/mono.msi" ]; then
|
||||
wget -q -O $WINEPREFIX/mono.msi http://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.msi
|
||||
wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/7.1.1/wine-mono-7.1.1-x86.msi
|
||||
fi
|
||||
|
||||
wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log
|
||||
|
Reference in New Issue
Block a user