diff --git a/README.md b/README.md index f52ecd2..bac34af 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Services deployed on [matthewtran.com](https://matthewtran.com). - gitea ([git.matthewtran.com](https://git.matthewtran.com)) - monerod - p2pool (`xmrig -o matthewtran.com`) +- tari - minecraft - minecraft bedrock - terraria diff --git a/config/provision.py b/config/provision.py index 0d04223..44f6ee0 100755 --- a/config/provision.py +++ b/config/provision.py @@ -14,7 +14,7 @@ from update import SOURCE_DIR, IMAGES, generate UIDS = { "web" : 1001, - "monero" : 1002, + "crypto" : 1002, "game" : 1003, "nas" : 1004, } @@ -25,7 +25,7 @@ PORTS = { "443:443", "2222:22", # gitea ], - "monero": [ + "crypto": [ "18080:18080", # monerod "18081:18081", "3333:3333", # p2pool diff --git a/config/update.py b/config/update.py index 803b017..f999fe7 100755 --- a/config/update.py +++ b/config/update.py @@ -11,9 +11,10 @@ IMAGES = { "website", "gitea", ], - "monero": [ + "crypto": [ "monerod", "p2pool", + "tari", ], "game": [ "minecraft", diff --git a/monerod/Dockerfile b/monerod/Dockerfile index b17a8ad..5cf19b9 100644 --- a/monerod/Dockerfile +++ b/monerod/Dockerfile @@ -5,7 +5,8 @@ RUN apt-get install -y wget bzip2 WORKDIR /root -RUN wget https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.4.0.tar.bz2 -O monerod.tar.bz2 +# currently v0.18.4.0 +RUN wget -O monerod.tar.bz2 https://downloads.getmonero.org/cli/monero-linux-x64-v0.18.4.0.tar.bz2 RUN tar xvf monerod.tar.bz2 && rm monerod.tar.bz2 RUN mv monero-x86_64-linux-gnu-v0.18.4.0 monero diff --git a/p2pool/Dockerfile b/p2pool/Dockerfile index 99bcf02..645f753 100644 --- a/p2pool/Dockerfile +++ b/p2pool/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get install -y wget WORKDIR /root # 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 wget -O p2pool.tar.gz https://github.com/SChernykh/p2pool/releases/download/v4.5/p2pool-v4.5-linux-x64.tar.gz RUN tar xvf p2pool.tar.gz && rm p2pool.tar.gz RUN mv p2pool-v4.5-linux-x64/p2pool ./p2pool diff --git a/p2pool/entry.sh b/p2pool/entry.sh index 0068b76..f66afc7 100644 --- a/p2pool/entry.sh +++ b/p2pool/entry.sh @@ -4,4 +4,5 @@ cd /data exec ~/p2pool \ --mini \ --host 127.0.0.1 \ - --wallet 42j7pyNRf8WE96D1xb6pjPWCwaDaYYevwZSPpELbTJjnXiKp7Lhtahbhb5Gc3p2BVxgMB3FEGNPUcbST1oZds6nBERA4jrQ + --wallet 42j7pyNRf8WE96D1xb6pjPWCwaDaYYevwZSPpELbTJjnXiKp7Lhtahbhb5Gc3p2BVxgMB3FEGNPUcbST1oZds6nBERA4jrQ \ + --merge-mine tari://127.0.0.1:18102 12AZgW4PXRsmsAzWEmfmGtBy1KKvYYKA2VByvjFBqEa7ZmuL3vrfcaA5oo5DogAPWpVyTGdfKkdLktYCQz5vVUD4Zir diff --git a/tari/Dockerfile b/tari/Dockerfile new file mode 100644 index 0000000..bd71502 --- /dev/null +++ b/tari/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:24.04 + +RUN apt-get update && apt-get -y upgrade +RUN apt-get install -y wget unzip + +WORKDIR /root + +# currently v2.0.1 +RUN wget -O tari.zip https://github.com/tari-project/tari/releases/download/v2.0.1/tari_suite-2.0.1-09831ca-linux-x86_64.zip +RUN unzip tari.zip -d tari && rm tari.zip + +COPY entry.sh ./ + +CMD ["/bin/bash", "/root/entry.sh"] diff --git a/tari/entry.sh b/tari/entry.sh new file mode 100644 index 0000000..1028738 --- /dev/null +++ b/tari/entry.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# TODO clean termination? +~/tari/minotari_node -n -b /data --grpc-enabled --mining-enabled --watch status & +trap 'echo "stopping tari node..."' SIGTERM SIGINT +tail -f /dev/null & +wait $!