From 20bc259f264fc342c46e1958c6b21b82b3047c91 Mon Sep 17 00:00:00 2001 From: Matthew Tran Date: Sat, 6 Jun 2026 23:14:14 -0700 Subject: [PATCH] lots of uprevs --- config/update.py | 9 +++------ gitea/Dockerfile | 2 +- minecraft/Dockerfile | 10 +++++----- minecraft_bedrock/Dockerfile | 6 +++--- monerod/Dockerfile | 8 ++++---- monerod/entry.sh | 2 +- nas/Dockerfile.template | 2 +- nas/entry.sh | 2 +- p2pool/Dockerfile | 8 ++++---- terraria/Dockerfile | 13 +++++++++---- website/Dockerfile | 2 +- website/entry.sh | 2 +- 12 files changed, 34 insertions(+), 32 deletions(-) diff --git a/config/update.py b/config/update.py index 5f2208b..e5a9f3f 100755 --- a/config/update.py +++ b/config/update.py @@ -90,16 +90,13 @@ if __name__ == "__main__": continue print(f"building images for {user}...") run([f"cd {SOURCE_DIR}"] + [ - f"sudo -u {user} podman build --tag {i} {SOURCE_DIR}/{i}" + f"podman build --tag {i} {SOURCE_DIR}/{i}" for i in IMAGES[user] - ]) + ], user=user) # restart pods for user in IMAGES: if not IMAGES[user]: continue print(f"restarting pod for {user}...") - run([ - f"cd {SOURCE_DIR}", - f"sudo systemctl --machine={user}@.host --user restart {user}-pod " + " ".join(IMAGES[user]), - ]) + run([f"systemctl --user restart {user}-pod " + " ".join(IMAGES[user])], user=user) diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 0a0d43b..10200c4 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -1 +1 @@ -FROM docker.io/gitea/gitea:1.23.7 +FROM docker.io/gitea/gitea:1.26.2 diff --git a/minecraft/Dockerfile b/minecraft/Dockerfile index e37e9d9..c3c0e4f 100644 --- a/minecraft/Dockerfile +++ b/minecraft/Dockerfile @@ -1,16 +1,16 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update && apt-get -y upgrade -RUN apt-get install -y wget openjdk-21-jre +RUN apt-get install -y wget openjdk-25-jre WORKDIR /root # from https://github.com/itzg/rcon-cli -RUN wget -O rcon-cli.tar.gz https://github.com/itzg/rcon-cli/releases/download/1.7.0/rcon-cli_1.7.0_linux_amd64.tar.gz +RUN wget -O rcon-cli.tar.gz https://github.com/itzg/rcon-cli/releases/download/1.7.5/rcon-cli_1.7.5_linux_amd64.tar.gz RUN tar xvf rcon-cli.tar.gz && rm rcon-cli.tar.gz -# from https://www.minecraft.net/en-us/download/server (currently 1.21.11) -RUN wget https://piston-data.mojang.com/v1/objects/64bb6d763bed0a9f1d632ec347938594144943ed/server.jar +# from https://www.minecraft.net/en-us/download/server (currently 26.1.2) +RUN wget https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar COPY entry.sh ./ COPY eula.txt ./ diff --git a/minecraft_bedrock/Dockerfile b/minecraft_bedrock/Dockerfile index 787d738..0e990a4 100644 --- a/minecraft_bedrock/Dockerfile +++ b/minecraft_bedrock/Dockerfile @@ -1,12 +1,12 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update && apt-get -y upgrade RUN apt-get install -y wget unzip curl tmux WORKDIR /root -# from https://www.minecraft.net/en-us/download/server/bedrock (currently 1.21.82.1) -RUN wget -O server.zip --user-agent "Mozilla/5.0" https://www.minecraft.net/bedrockdedicatedserver/bin-linux/bedrock-server-1.21.82.1.zip +# from https://www.minecraft.net/en-us/download/server/bedrock (currently 1.26.23.1) +RUN wget -O server.zip --user-agent "Mozilla/5.0" https://www.minecraft.net/bedrockdedicatedserver/bin-linux/bedrock-server-1.26.23.1.zip RUN unzip server.zip && rm server.zip COPY entry.sh ./ diff --git a/monerod/Dockerfile b/monerod/Dockerfile index 3b5bc6a..a5f43cb 100644 --- a/monerod/Dockerfile +++ b/monerod/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update && apt-get -y upgrade RUN apt-get install -y wget bzip2 WORKDIR /root -# currently v0.18.4.4 -RUN wget -O monerod.tar.bz2 https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.4.4.tar.bz2 +# currently v0.18.5.0 +RUN wget -O monerod.tar.bz2 https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.5.0.tar.bz2 RUN tar xvf monerod.tar.bz2 && rm monerod.tar.bz2 -RUN mv monero-x86_64-linux-gnu-v0.18.4.4 monero +RUN mv monero-x86_64-linux-gnu-v0.18.5.0 monero COPY entry.sh ./ diff --git a/monerod/entry.sh b/monerod/entry.sh index 3de3c0e..5ac083a 100644 --- a/monerod/entry.sh +++ b/monerod/entry.sh @@ -17,5 +17,5 @@ cleanup() { monero/monerod exit --rpc-bind-port 18089 } trap 'cleanup' SIGTERM SIGINT -tail -f /dev/null & +sleep infinity & wait $! diff --git a/nas/Dockerfile.template b/nas/Dockerfile.template index 04f8bfb..6b3a0cc 100644 --- a/nas/Dockerfile.template +++ b/nas/Dockerfile.template @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/nas/entry.sh b/nas/entry.sh index 4311ace..6e45b77 100644 --- a/nas/entry.sh +++ b/nas/entry.sh @@ -2,5 +2,5 @@ smbd -s smb.conf trap 'echo "stopping smbd..."' SIGTERM SIGINT -tail -f /dev/null & +sleep infinity & wait $! diff --git a/p2pool/Dockerfile b/p2pool/Dockerfile index 75dadaa..1051dc7 100644 --- a/p2pool/Dockerfile +++ b/p2pool/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update && apt-get -y upgrade RUN apt-get install -y wget WORKDIR /root -# currently v4.13 -RUN wget -O p2pool.tar.gz https://github.com/SChernykh/p2pool/releases/download/v4.13/p2pool-v4.13-linux-x64.tar.gz +# currently v4.15.1 +RUN wget -O p2pool.tar.gz https://github.com/SChernykh/p2pool/releases/download/v4.15.1/p2pool-v4.15.1-linux-x64.tar.gz RUN tar xvf p2pool.tar.gz && rm p2pool.tar.gz -RUN mv p2pool-v4.13-linux-x64/p2pool ./p2pool +RUN mv p2pool-v4.15.1-linux-x64/p2pool ./p2pool COPY entry.sh ./ diff --git a/terraria/Dockerfile b/terraria/Dockerfile index 4976997..6827759 100644 --- a/terraria/Dockerfile +++ b/terraria/Dockerfile @@ -1,12 +1,17 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update && apt-get -y upgrade -RUN apt-get install -y wget unzip python3 iproute2 dotnet-runtime-8.0 +RUN apt-get install -y wget unzip python3 iproute2 + +# .NET 8.0 not available by default in 26.04 +RUN apt-get install -y software-properties-common +RUN add-apt-repository ppa:dotnet/backports +RUN apt-get install -y dotnet-runtime-8.0 WORKDIR /root -# from https://github.com/tModLoader/tModLoader/releases (currently v2025.11.3.0) -RUN wget https://github.com/tModLoader/tModLoader/releases/download/v2025.11.3.0/tModLoader.zip +# from https://github.com/tModLoader/tModLoader/releases (currently v2026.04.3.0) +RUN wget https://github.com/tModLoader/tModLoader/releases/download/v2026.04.3.0/tModLoader.zip RUN unzip tModLoader.zip -d server && rm tModLoader.zip RUN chmod +x server/start-tModLoaderServer.sh diff --git a/website/Dockerfile b/website/Dockerfile index 1289c28..ea31547 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 # install dependencies ENV TZ=America/Los_Angeles diff --git a/website/entry.sh b/website/entry.sh index 2b9cbf4..74c5694 100644 --- a/website/entry.sh +++ b/website/entry.sh @@ -24,5 +24,5 @@ python3 ip.py & # run server nginx -c ~/server.conf trap 'echo "stopping website..."' SIGTERM SIGINT -tail -f /dev/null & +sleep infinity & wait $!