From f2df23ad982f274b7e4e6c2a2455e1d54a50fd2b Mon Sep 17 00:00:00 2001
From: Matthew Tran <matthewlamtran@berkeley.edu>
Date: Sun, 4 May 2025 01:35:37 -0700
Subject: [PATCH] wip5

---
 .gitignore            | 11 -----------
 monerod/.dockerignore |  1 -
 monerod/Dockerfile    | 12 ++++++------
 monerod/entry.sh      |  3 ++-
 p2pool/.dockerignore  |  1 -
 p2pool/Dockerfile     | 14 +++++++-------
 p2pool/entry.sh       |  5 +++--
 scripts/provision.py  |  7 +++++++
 scripts/update.py     |  4 ++++
 9 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 monerod/.dockerignore
 delete mode 100644 p2pool/.dockerignore

diff --git a/.gitignore b/.gitignore
index 2a9e688..1b3aa67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,23 +20,12 @@ terraria/*.txt
 
 
 
-compose.override.yml
-
 # website
 website/gitea
 website/certbot
 website/sendgrid.key
 
-# monerod
-monerod/.bitmonero
-
-# p2pool
-p2pool/cache
-
 # nas
 nas/*.json
 nas/smb.conf
 nas/users.sh
-
-# backup
-data.zip
diff --git a/monerod/.dockerignore b/monerod/.dockerignore
deleted file mode 100644
index 64677db..0000000
--- a/monerod/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-.bitmonero
diff --git a/monerod/Dockerfile b/monerod/Dockerfile
index 2cc768f..b17a8ad 100644
--- a/monerod/Dockerfile
+++ b/monerod/Dockerfile
@@ -3,12 +3,12 @@ FROM ubuntu:24.04
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget bzip2
 
-RUN groupadd -g 2001 me && useradd -u 2001 -g 2001 -m me
-USER me
-WORKDIR /home/me
+WORKDIR /root
 
-RUN wget https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.3.4.tar.bz2 -O monerod.tar.bz2
+RUN wget https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.4.0.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.4 monero
+RUN mv monero-x86_64-linux-gnu-v0.18.4.0 monero
 
-COPY --chown=me:me entry.sh ./
+COPY entry.sh ./
+
+CMD ["/bin/bash", "/root/entry.sh"]
diff --git a/monerod/entry.sh b/monerod/entry.sh
index be29ffc..65d27a1 100644
--- a/monerod/entry.sh
+++ b/monerod/entry.sh
@@ -3,6 +3,7 @@
 # check bitmonero.log for log
 monero/monerod \
     --prune-blockchain \
+    --data-dir /root/data \
     --rpc-bind-port 18089 \
     --rpc-restricted-bind-ip 0.0.0.0 \
     --rpc-restricted-bind-port 18081 \
@@ -17,6 +18,6 @@ monero/monerod \
 cleanup() {
     monero/monerod exit --rpc-bind-port 18089
 }
-trap 'cleanup' TERM
+trap 'cleanup' SIGTERM SIGINT
 tail -f /dev/null &
 wait $!
diff --git a/p2pool/.dockerignore b/p2pool/.dockerignore
deleted file mode 100644
index 06cf653..0000000
--- a/p2pool/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-cache
diff --git a/p2pool/Dockerfile b/p2pool/Dockerfile
index 6a8dd43..99bcf02 100644
--- a/p2pool/Dockerfile
+++ b/p2pool/Dockerfile
@@ -3,13 +3,13 @@ FROM ubuntu:24.04
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget
 
-RUN groupadd -g 2001 me && useradd -u 2001 -g 2001 -m me
-USER me
-WORKDIR /home/me
+WORKDIR /root
 
-# currently v4.4
-RUN wget https://github.com/SChernykh/p2pool/releases/download/v4.4/p2pool-v4.4-linux-x64.tar.gz -O p2pool.tar.gz
+# currently v4.5
+RUN wget https://github.com/SChernykh/p2pool/releases/download/v4.5/p2pool-v4.5-linux-x64.tar.gz -O p2pool.tar.gz
 RUN tar xvf p2pool.tar.gz && rm p2pool.tar.gz
-RUN mv p2pool-v4.4-linux-x64/p2pool ./p2pool
+RUN mv p2pool-v4.5-linux-x64/p2pool ./p2pool
 
-COPY --chown=me:me entry.sh ./
+COPY entry.sh ./
+
+CMD ["/bin/bash", "/root/entry.sh"]
diff --git a/p2pool/entry.sh b/p2pool/entry.sh
index 5466ba8..ad956fb 100644
--- a/p2pool/entry.sh
+++ b/p2pool/entry.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-cd cache
+mkdir -p data
+cd data
 exec ~/p2pool \
     --mini \
-    --host monerod \
+    --host 127.0.0.1 \
     --wallet 42j7pyNRf8WE96D1xb6pjPWCwaDaYYevwZSPpELbTJjnXiKp7Lhtahbhb5Gc3p2BVxgMB3FEGNPUcbST1oZds6nBERA4jrQ
diff --git a/scripts/provision.py b/scripts/provision.py
index 85d732f..816567e 100755
--- a/scripts/provision.py
+++ b/scripts/provision.py
@@ -16,6 +16,13 @@ UIDS = {
 }
 
 PORTS = {
+    "monero": [
+        "18080:18080", # monerod
+        "18081:18081",
+        "3333:3333", # p2pool
+        "37888:37888",
+        "37889:37889",
+    ],
     "game": [
         "25565:25565", # minecraft
         "19132:19132/udp", # minecraft_bedrock
diff --git a/scripts/update.py b/scripts/update.py
index 28506e7..8fed18d 100755
--- a/scripts/update.py
+++ b/scripts/update.py
@@ -8,6 +8,10 @@ from pathlib import Path
 SOURCE_DIR = "/var/source"
 
 IMAGES = {
+    "monero": [
+        "monerod",
+        "p2pool",
+    ],
     "game": [
         "minecraft",
         "minecraft_bedrock",