diff --git a/docker-compose/cfg/configure.py b/docker-compose/cfg/configure.py index f978e4f..dab2067 100755 --- a/docker-compose/cfg/configure.py +++ b/docker-compose/cfg/configure.py @@ -611,7 +611,7 @@ class MoneroConfigForm(ConfigFormBase): self.sync_pruned_blocks = self.add( npyscreen.Checkbox, name="Sync Pruned Blocks", - value=False, + value=True, begin_entry_at=self.name_size, relx=self.indent, ) diff --git a/docker-compose/cfg/defaults b/docker-compose/cfg/defaults index 67a5445..dba6de5 100644 --- a/docker-compose/cfg/defaults +++ b/docker-compose/cfg/defaults @@ -21,7 +21,7 @@ "limit_data_rates": false, "rate_limit_up": "2048", "rate_limit_down": "8192", - "sync_pruned_blocks": false, + "sync_pruned_blocks": true, "fast_sync": true, "monero_options": "", "public_monero_node": "", diff --git a/docker-compose/current_config b/docker-compose/current_config index 7dad27e..5702452 100644 --- a/docker-compose/current_config +++ b/docker-compose/current_config @@ -23,7 +23,7 @@ "limit_data_rates": false, "rate_limit_up": "2048", "rate_limit_down": "8192", - "sync_pruned_blocks": false, + "sync_pruned_blocks": true, "fast_sync": true, "monero_options": "", "public_monero_node": "", diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 7366cd0..bddd71a 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -111,6 +111,8 @@ services: --prune-blockchain + --sync-pruned-blocks + diff --git a/docker-compose/monero/Dockerfile b/docker-compose/monero/Dockerfile index a0eda57..69e2949 100644 --- a/docker-compose/monero/Dockerfile +++ b/docker-compose/monero/Dockerfile @@ -4,8 +4,9 @@ FROM ubuntu:22.04 as builder ARG MONERO_GIT_TAG="latest" -RUN set -e && \ - apt-get update -q -y --no-install-recommends && \ +SHELL ["/bin/bash", "-euxo", "pipefail", "-c"] + +RUN apt-get update -q -y --no-install-recommends && \ DEBIAN_FRONTEND="noninteractive" apt-get install -q -y --no-install-recommends \ autoconf \ automake \ @@ -26,13 +27,17 @@ RUN set -e && \ python3 \ gperf - WORKDIR /src + RUN git clone --recursive --branch release-v0.18 https://github.com/monero-project/monero && \ cd monero && \ if [ "x$MONERO_GIT_TAG" = "xlatest" ]; then MONERO_GIT_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)); fi && \ git checkout $MONERO_GIT_TAG && \ git submodule sync && git submodule update --init --force --recursive && \ + curl -L -O https://p2pool.io/checkpoints/checkpoints.dat && \ + curl -L -O https://p2pool.io/checkpoints/checkpoints.patch && \ + git apply checkpoints.patch && \ + cp -f checkpoints.dat src/blocks && \ make -j$(nproc) # --- @@ -42,8 +47,9 @@ FROM ubuntu:22.04 COPY --from=0 /src/monero/build/Linux/*/release/bin /usr/local/bin/ -RUN set -e && \ - apt-get update -q -y --no-install-recommends && \ +SHELL ["/bin/bash", "-euxo", "pipefail", "-c"] + +RUN apt-get update -q -y --no-install-recommends && \ DEBIAN_FRONTEND="noninteractive" apt-get install -q -y --no-install-recommends \ ca-certificates \ netcat \