From e9f8a77d262c84b448b946757c0221a36b45ddde Mon Sep 17 00:00:00 2001
From: Matthew Tran <matthewlamtran@berkeley.edu>
Date: Wed, 21 Aug 2024 07:29:56 +0000
Subject: [PATCH] update p2pool, monerod, minecraft, ubuntu

---
 minecraft/Dockerfile |  8 ++++----
 monerod/Dockerfile   |  8 ++++----
 monerod/entry.sh     |  2 +-
 p2pool/Dockerfile    | 10 +++++-----
 terraria/Dockerfile  |  2 +-
 website/Dockerfile   |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/minecraft/Dockerfile b/minecraft/Dockerfile
index 95fd34a..b026350 100644
--- a/minecraft/Dockerfile
+++ b/minecraft/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y wget openjdk-18-jre
+RUN apt-get install -y wget openjdk-21-jre
 
 RUN useradd -m matt
 USER matt
@@ -10,8 +10,8 @@ WORKDIR /home/matt
 RUN wget https://github.com/Tiiffi/mcrcon/releases/download/v0.7.2/mcrcon-0.7.2-linux-x86-64.tar.gz
 RUN tar xvf mcrcon-0.7.2-linux-x86-64.tar.gz
 
-# from https://www.minecraft.net/en-us/download/server (currently 1.20.4)
-RUN wget https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar
+# from https://www.minecraft.net/en-us/download/server (currently 1.21)
+RUN wget https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar
 
 COPY --chown=matt:matt eula.txt ./
 COPY --chown=matt:matt entry.sh ./
diff --git a/monerod/Dockerfile b/monerod/Dockerfile
index 4002baf..c6c75eb 100644
--- a/monerod/Dockerfile
+++ b/monerod/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget bzip2
@@ -7,8 +7,8 @@ RUN useradd -m matt
 USER matt
 WORKDIR /home/matt
 
-RUN wget https://downloads.getmonero.org/cli/linux64
-RUN tar xvf linux64 && rm linux64
-RUN mv monero-x86_64-linux-gnu-v0.18.3.2/ monero/
+RUN wget https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.3.3.tar.bz2 -O monerod.tar.bz2
+RUN tar xvf monerod.tar.bz2 && rm monerod.tar.bz2
+RUN mv monero-x86_64-linux-gnu-v0.18.3.3 monero
 
 COPY --chown=matt:matt entry.sh ./
diff --git a/monerod/entry.sh b/monerod/entry.sh
index 033ba09..346f4ce 100644
--- a/monerod/entry.sh
+++ b/monerod/entry.sh
@@ -6,7 +6,7 @@ monero/monerod \
     --confirm-external-bind \
     --restricted-rpc \
     --zmq-pub tcp://0.0.0.0:18083 \
-    --out-peers 64 --in-peers 32 \
+    --out-peers 32 --in-peers 64 \
     --add-priority-node=p2pmd.xmrvsbeast.com:18080 \
     --add-priority-node=nodes.hashvault.pro:18080 \
     --disable-dns-checkpoints \
diff --git a/p2pool/Dockerfile b/p2pool/Dockerfile
index 09a170d..1f75d13 100644
--- a/p2pool/Dockerfile
+++ b/p2pool/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget
@@ -7,9 +7,9 @@ RUN useradd -m matt
 USER matt
 WORKDIR /home/matt
 
-# currently v3.10
-RUN wget https://github.com/SChernykh/p2pool/releases/download/v3.10/p2pool-v3.10-linux-x64.tar.gz
-RUN tar xvf p2pool-v3.10-linux-x64.tar.gz
-RUN mv p2pool-v3.10-linux-x64/p2pool ./p2pool
+# currently v4.1
+RUN wget https://github.com/SChernykh/p2pool/releases/download/v4.1/p2pool-v4.1-linux-x64.tar.gz -O p2pool.tar.gz
+RUN tar xvf p2pool.tar.gz && rm p2pool.tar.gz
+RUN mv p2pool-v4.1-linux-x64/p2pool ./p2pool
 
 COPY --chown=matt:matt entry.sh ./
diff --git a/terraria/Dockerfile b/terraria/Dockerfile
index 6613e1e..03a48bd 100644
--- a/terraria/Dockerfile
+++ b/terraria/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget unzip
diff --git a/website/Dockerfile b/website/Dockerfile
index 1da8f0c..f0927f2 100644
--- a/website/Dockerfile
+++ b/website/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # install dependencies
 ENV TZ=America/Los_Angeles
@@ -6,7 +6,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y nginx certbot python3-certbot-nginx python3-pip
-RUN pip3 install sendgrid
+RUN pip3 install sendgrid --break-system-packages
 
 RUN rm /etc/nginx/sites-enabled/default