From 5f1b7ebf1dbe9a1e617f392546dcb3750d313843 Mon Sep 17 00:00:00 2001 From: nyuuzyou <130591045+nyuuzyou@users.noreply.github.com> Date: Fri, 13 Dec 2024 07:16:59 +0300 Subject: [PATCH] Add spy node ban list (#28) * Add spy node ban list * Update dockerfiles/monero Co-authored-by: Dvd-Znf <101937630+Dvd-Znf@users.noreply.github.com> --------- Co-authored-by: lalanza808 Co-authored-by: Dvd-Znf <101937630+Dvd-Znf@users.noreply.github.com> --- docker-compose.full.yaml | 4 ++-- docker-compose.yaml | 4 ++-- dockerfiles/monero | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker-compose.full.yaml b/docker-compose.full.yaml index d51c857..b1611ad 100644 --- a/docker-compose.full.yaml +++ b/docker-compose.full.yaml @@ -91,5 +91,5 @@ services: - 127.0.0.1:${ZMQ_PORT:-18082}:18082 # zmq - 127.0.0.1:${UNRESTRICTED_PORT:-18083}:18083 # unrestricted rpc command: - monerod --data-dir=/data --p2p-bind-ip=0.0.0.0 --p2p-bind-port=18080 --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18081 --zmq-rpc-bind-ip=0.0.0.0 --zmq-rpc-bind-port=18082 --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18083 --non-interactive --confirm-external-bind --public-node --log-level=0 --enable-dns-blocklist --rpc-ssl=disabled - <<: *log-config \ No newline at end of file + monerod --data-dir=/data --p2p-bind-ip=0.0.0.0 --p2p-bind-port=18080 --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18081 --zmq-rpc-bind-ip=0.0.0.0 --zmq-rpc-bind-port=18082 --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18083 --non-interactive --confirm-external-bind --public-node --log-level=0 --enable-dns-blocklist --rpc-ssl=disabled --ban-list=/ban_list.txt + <<: *log-config diff --git a/docker-compose.yaml b/docker-compose.yaml index 7776ca2..78e6ce9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -91,5 +91,5 @@ services: - 127.0.0.1:${ZMQ_PORT:-18082}:18082 # zmq - 127.0.0.1:${UNRESTRICTED_PORT:-18083}:18083 # unrestricted rpc command: - monerod --data-dir=/data --p2p-bind-ip=0.0.0.0 --p2p-bind-port=18080 --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18081 --zmq-rpc-bind-ip=0.0.0.0 --zmq-rpc-bind-port=18082 --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18083 --non-interactive --confirm-external-bind --public-node --log-level=0 --enable-dns-blocklist --rpc-ssl=disabled - <<: *log-config \ No newline at end of file + monerod --data-dir=/data --p2p-bind-ip=0.0.0.0 --p2p-bind-port=18080 --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18081 --zmq-rpc-bind-ip=0.0.0.0 --zmq-rpc-bind-port=18082 --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18083 --non-interactive --confirm-external-bind --public-node --log-level=0 --enable-dns-blocklist --rpc-ssl=disabled --ban-list=/ban_list.txt + <<: *log-config diff --git a/dockerfiles/monero b/dockerfiles/monero index 93b7731..a5ec738 100644 --- a/dockerfiles/monero +++ b/dockerfiles/monero @@ -8,6 +8,7 @@ ENV MONERO_SUMS_FILE sha256sums WORKDIR /opt/monero # Update system and install dependencies +# Download ban list # Download Monero binaries from getmonero.org # Confirm hashes match # Install daemon binary @@ -16,6 +17,8 @@ WORKDIR /opt/monero RUN apt-get update \ && apt-get upgrade -y \ && apt-get install -y tar wget bzip2 + +RUN wget -qO /ban_list.txt "https://raw.githubusercontent.com/Boog900/monero-ban-list/main/ban_list.txt" RUN wget -qO ${MONERO_DL_FILE} ${MONERO_DL_URL} \ && echo "${MONERO_HASH} ${MONERO_DL_FILE}" > ${MONERO_SUMS_FILE} \ @@ -37,6 +40,7 @@ WORKDIR /data # Copy to fresh Ubuntu image to reduce size FROM ubuntu:22.04 COPY --from=OG /usr/local/bin/monerod /usr/local/bin/monerod +COPY --from=OG /ban_list.txt /ban_list.txt EXPOSE 18080 EXPOSE 18081