From 619bfd940d1ae9c44a2c57bd4aad9041b7efe44f Mon Sep 17 00:00:00 2001
From: Gary Benson <gary@gbenson.net>
Date: Wed, 18 Oct 2023 18:03:39 +0100
Subject: [PATCH] Base monerod on sethforprivacy/simple-monerod-docker

---
 monerod/Dockerfile | 58 ++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/monerod/Dockerfile b/monerod/Dockerfile
index 39812af..a053ba1 100644
--- a/monerod/Dockerfile
+++ b/monerod/Dockerfile
@@ -1,45 +1,37 @@
-FROM debian:12 as base
+# https://github.com/sethforprivacy/simple-monerod-docker
+# https://hub.docker.com/r/sethsimmons/simple-monerod/tags
+FROM sethsimmons/simple-monerod:v0.18.3.1
 
-ENV NAME=monero
-ENV VERSION=v0.18.3.1
-ENV TARBALL=$NAME-linux-x64-$VERSION.tar.bz2
-ENV DOWNLOAD=https://downloads.getmonero.org/cli
-ENV HASH=23af572fdfe3459b9ab97e2e9aa7e3c11021c955d6064b801a27d7e8c21ae09d
+ARG m_USER=monerod
+ARG m_UID=801
+ARG m_GID=$m_UID
+ARG m_HOME=/nonexistent
+ARG m_SHELL=/usr/sbin/nologin
 
+USER root
+WORKDIR /
 RUN set -eux \
   \
-  && apt-get -y update \
-  && apt-get -y upgrade \
-  && apt-get -y install curl bzip2 \
-  && apt-get -y clean \
-  && rm -rf /var/lib/apt
+  && sed -i "s/fixuid -q//" /entrypoint.sh \
+  && rm -f /usr/local/bin/fixuid \
+  && chown 0:0 /usr/local/bin/monerod \
+  && mv /usr/local/bin/monerod /usr/bin \
+  && deluser --remove-home monero \
+  && addgroup -S -g $m_GID $m_USER \
+  && adduser -h $m_HOME -s $m_SHELL -G $m_USER -u $m_UID -D -g "" $m_USER \
+  && mkdir -m 0700 /srv/monerod \
+  && chown $m_UID:$m_GID /srv/monerod
 
-FROM base as builder
-RUN set -eux \
-  \
-  && curl -Lo $TARBALL $DOWNLOAD/$TARBALL \
-  && sha256sum $TARBALL \
-  && echo "$HASH  $TARBALL" > SHA256SUMS \
-  && sha256sum -c SHA256SUMS \
-  && tar xf $TARBALL \
-  && rm $TARBALL \
-  && mv /$NAME-* /$NAME
-
-FROM base
-COPY --from=builder /$NAME/$NAME* /usr/bin/
-RUN set -eux \
-  \
-  && addgroup --system --gid 101 monerod \
-  && adduser --system --uid 101 --gid 101 --disabled-password monerod
+VOLUME /srv/monerod
 
-VOLUME /srv
-USER monerod
+USER $m_USER:$m_USER
 
-ENTRYPOINT ["monerod"]
-CMD ["--non-interactive", \
-     "--data-dir", "/srv/monerod", \
+CMD ["--data-dir", "/srv/monerod", \
+     "--max-log-file-size", "10485760", \
+     "--max-log-files", "4", \
      "--rpc-bind-ip", "0.0.0.0", "--confirm-external-bind", \
      "--zmq-pub", "tcp://0.0.0.0:18083", \
+     "--no-igd", \
      "--out-peers", "16", "--in-peers", "8", \
      "--add-priority-node=p2pmd.xmrvsbeast.com:18080", \
      "--add-priority-node=nodes.hashvault.pro:18080", \