mirror of
https://github.com/dragonlock2/matthewtran.com.git
synced 2026-06-28 01:58:34 +00:00
Compare commits
4 Commits
71988b74ff
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 35036f8c03 | |||
| 20bc259f26 | |||
| fe2258b0e7 | |||
| ae5ffa9a4a |
+11
-5
@@ -163,15 +163,14 @@ def add_packages():
|
||||
"ExecStart=/usr/bin/rpm-ostree install -y --allow-inactive " + " ".join([
|
||||
"alsa-utils",
|
||||
"avahi",
|
||||
"chromium",
|
||||
"firefox",
|
||||
"flatpak",
|
||||
"htop",
|
||||
"python3",
|
||||
"seatd",
|
||||
"sway",
|
||||
"tmux",
|
||||
"usbutils",
|
||||
"vim",
|
||||
"weston",
|
||||
"zip",
|
||||
]),
|
||||
"ExecStart=/bin/touch /etc/rpm/%N.stamp",
|
||||
@@ -181,12 +180,13 @@ def add_packages():
|
||||
]),
|
||||
},
|
||||
{ # TODO update once done https://github.com/coreos/rpm-ostree/issues/49
|
||||
"name": "post-rpm-ostree-install.service",
|
||||
"name": "tv-setup.service",
|
||||
"enabled": True,
|
||||
"contents": "\n".join([
|
||||
"[Unit]",
|
||||
"Description=Post package install setup",
|
||||
"After=local-fs.target",
|
||||
"Wants=network-online.target",
|
||||
"After=network-online.target",
|
||||
"ConditionPathExists=/etc/rpm/rpm-ostree-install.stamp",
|
||||
"ConditionPathExists=!/etc/rpm/%N.stamp",
|
||||
"[Service]",
|
||||
@@ -195,6 +195,12 @@ def add_packages():
|
||||
"ExecStart=/usr/bin/sh -c 'grep -E \"^(audio|seat|video):\" /usr/lib/group >> /etc/group'",
|
||||
"ExecStart=/usr/bin/usermod -aG audio,seat,video tv",
|
||||
"ExecStart=/usr/bin/systemctl enable --now seatd",
|
||||
"ExecStart=flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo",
|
||||
"ExecStart=flatpak install -y " + " ".join([
|
||||
"com.brave.Browser",
|
||||
"org.mozilla.firefox",
|
||||
"com.valvesoftware.SteamLink",
|
||||
]),
|
||||
"ExecStart=/bin/touch /etc/rpm/%N.stamp",
|
||||
"[Install]",
|
||||
"WantedBy=multi-user.target",
|
||||
|
||||
+3
-6
@@ -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)
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
FROM docker.io/gitea/gitea:1.23.7
|
||||
FROM docker.io/gitea/gitea:1.26.2
|
||||
|
||||
@@ -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 ./
|
||||
|
||||
@@ -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 ./
|
||||
|
||||
+4
-4
@@ -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 ./
|
||||
|
||||
|
||||
+1
-1
@@ -17,5 +17,5 @@ cleanup() {
|
||||
monero/monerod exit --rpc-bind-port 18089
|
||||
}
|
||||
trap 'cleanup' SIGTERM SIGINT
|
||||
tail -f /dev/null &
|
||||
sleep infinity &
|
||||
wait $!
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -2,5 +2,5 @@
|
||||
|
||||
smbd -s smb.conf
|
||||
trap 'echo "stopping smbd..."' SIGTERM SIGINT
|
||||
tail -f /dev/null &
|
||||
sleep infinity &
|
||||
wait $!
|
||||
|
||||
+4
-4
@@ -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.16
|
||||
RUN wget -O p2pool.tar.gz https://github.com/SChernykh/p2pool/releases/download/v4.16/p2pool-v4.16-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.16-linux-x64/p2pool ./p2pool
|
||||
|
||||
COPY entry.sh ./
|
||||
|
||||
|
||||
+9
-4
@@ -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
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:24.04
|
||||
FROM ubuntu:26.04
|
||||
|
||||
# install dependencies
|
||||
ENV TZ=America/Los_Angeles
|
||||
|
||||
+1
-1
@@ -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 $!
|
||||
|
||||
Reference in New Issue
Block a user