From b646b881131c1686848a9a674552146f6c91fdaa Mon Sep 17 00:00:00 2001 From: lza_menace Date: Thu, 19 Dec 2024 12:28:56 -0800 Subject: [PATCH] update docker-files with dependency order and use new monerod command --- docker-compose.full.yaml | 44 ++++++++++++++++++++++++++++++++++------ docker-compose.yaml | 11 ++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/docker-compose.full.yaml b/docker-compose.full.yaml index b1611ad..7953a50 100644 --- a/docker-compose.full.yaml +++ b/docker-compose.full.yaml @@ -1,5 +1,3 @@ -version: "3.7" - volumes: grafana: prometheus: @@ -11,7 +9,7 @@ x-log-config: &log-config max-size: "50m" max-file: "20" -services: +services: prometheus: image: prom/prometheus:${PROM_TAG:-v2.36.0} command: @@ -20,6 +18,9 @@ services: - --storage.tsdb.retention.time=${PROM_RETENTION:-360d} container_name: monerod_prometheus restart: unless-stopped + depends_on: + exporter: + condition: service_started ports: - 127.0.0.1:9090:9090 volumes: @@ -60,6 +61,9 @@ services: context: . dockerfile: dockerfiles/exporter restart: unless-stopped + depends_on: + monerod: + condition: service_started ports: - 127.0.0.1:9000:9000 command: @@ -71,18 +75,46 @@ services: build: context: . dockerfile: dockerfiles/nodemapper + depends_on: + monerod: + condition: service_started environment: NODE_HOST: monerod NODE_PORT: 18083 ports: - 127.0.0.1:${MAPPER_PORT:-5000}:5000 <<: *log-config + tor: + container_name: monerod_tor + build: + context: . + dockerfile: dockerfiles/tor + restart: unless-stopped + # ports: + # - 127.0.0.1:9050:9050 + <<: *log-config + i2p: + container_name: monerod_i2p + build: + context: . + dockerfile: dockerfiles/i2p + restart: unless-stopped + # ports: + # - 127.0.0.1:4444:4444 + <<: *log-config monerod: container_name: monerod build: - context: dockerfiles - dockerfile: monero_compile + context: . + dockerfile: dockerfiles/monero_compile + args: + THREADS: ${THREADS:-2} restart: unless-stopped + depends_on: + tor: + condition: service_started + i2p: + condition: service_started volumes: - ${DATA_DIR:-./data}:/data ports: @@ -91,5 +123,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 --ban-list=/ban_list.txt + /entrypoint.sh <<: *log-config diff --git a/docker-compose.yaml b/docker-compose.yaml index 5b18650..55e05f2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,6 +18,9 @@ services: - --storage.tsdb.retention.time=${PROM_RETENTION:-360d} container_name: monerod_prometheus restart: unless-stopped + depends_on: + exporter: + condition: service_started # ports: # - 127.0.0.1:9090:9090 volumes: @@ -58,6 +61,9 @@ services: context: . dockerfile: dockerfiles/exporter restart: unless-stopped + depends_on: + monerod: + condition: service_started # ports: # - 127.0.0.1:9000:9000 command: @@ -69,6 +75,9 @@ services: build: context: . dockerfile: dockerfiles/nodemapper + depends_on: + monerod: + condition: service_started environment: NODE_HOST: monerod NODE_PORT: 18083 @@ -111,4 +120,6 @@ services: - ${RESTRICTED_PORT:-18081}:18081 # restricted rpc - 127.0.0.1:${ZMQ_PORT:-18082}:18082 # zmq - 127.0.0.1:${UNRESTRICTED_PORT:-18083}:18083 # unrestricted rpc + command: + /entrypoint.sh <<: *log-config