Merge pull request #10 from ClubeBitcoinUnB/refactor/volume-defs

Define volumes only in node usdt docker file

Author: edilmedeiros

.bitcoin/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

.gitignore

@@ -7,7 +7,3 @@ include:
   - path: docker-compose/connectivity-check.yml
   - path: docker-compose/metrics.yml
   - path: docker-compose/websocket.yml
-
-volumes:
-  bitcoin-data:
-  bitcoin-bin:

docker-compose.yml

@@ -12,7 +12,6 @@ services:
     privileged: true
     volumes:
       - bitcoin-data:/home/bitcoin/.bitcoin
-      - bitcoin-bin:/shared
       - /sys/kernel/debug:/sys/kernel/debug
     depends_on:
       nats:
@@ -23,3 +22,11 @@ services:
       timeout: 3s
       retries: 3
       start_period: 5s
+
+volumes:
+  bitcoin-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: ../.bitcoin
+      o: bind

docker-compose/node.usdt.yml

@@ -30,21 +30,21 @@ esac
 
 # Start bitcoind as bitcoin user, in the background
 echo "Launching Bitcoin node in $BITCOIN_NETWORK mode..."
-/usr/sbin/runuser -u bitcoin -- /shared/bitcoind $NETWORK &
+/usr/sbin/runuser -u bitcoin -- $BTC_BIN_PATH/bitcoind $NETWORK &
 BITCOIND_PID=$!
 
 # Now wait for the RPC
 for i in {1..30}; do
-    /usr/sbin/runuser -u bitcoin -- /shared/bitcoin-cli $NETWORK getblockchaininfo >/dev/null 2>&1 && break
+    /usr/sbin/runuser -u bitcoin -- $BTC_BIN_PATH/bitcoin-cli $NETWORK getblockchaininfo >/dev/null 2>&1 && break
     sleep 1
 done
 
 # Final check
-if ! /usr/sbin/runuser -u bitcoin -- /shared/bitcoin-cli $NETWORK getblockchaininfo >/dev/null 2>&1; then
+if ! /usr/sbin/runuser -u bitcoin -- $BTC_BIN_PATH/bitcoin-cli $NETWORK getblockchaininfo >/dev/null 2>&1; then
     echo "Error: bitcoind did not start in time." >&2
     exit 1
 fi
 
 echo "Starting ebpf-extractor"
 # Run ebpf-extractor as root (needs CAP_SYS_ADMIN for BPF)
-exec /usr/local/bin/ebpf-extractor --no-idle-exit --nats-address nats://nats:4222 --bitcoind-path /shared/bitcoind
+exec /usr/local/bin/ebpf-extractor --no-idle-exit --nats-address nats://nats:4222 --bitcoind-path $BTC_BIN_PATH/bitcoind

docker/bitcoin-node-entrypoint.sh

@@ -13,4 +13,4 @@ case "$BITCOIN_NETWORK" in
     ;;
 esac
 
-exec su - bitcoin -c "/shared/bitcoin-cli $NETWORK getblockchaininfo"
+exec su - bitcoin -c "$BTC_BIN_PATH/bitcoin-cli $NETWORK getblockchaininfo"

docker/bitcoin-node-healthcheck.sh

@@ -82,21 +82,22 @@ RUN apt-get update && apt-get install -y \
 # in user land, not as root.
 RUN useradd -m -s /bin/bash bitcoin \
     && mkdir -p /home/bitcoin/.bitcoin \
-    && mkdir -p /shared \
-    && chown -R bitcoin:bitcoin /home/bitcoin /shared
+    && chown -R bitcoin:bitcoin /home/bitcoin
+
+# Set bitcoin binary path environment variable
+ENV BTC_BIN_PATH=/bitcoin/build/bin
 
 # Copy everything we need from builder
+COPY --from=btc-core-builder $BTC_BIN_PATH $BTC_BIN_PATH
 COPY --from=peer-observer-builder /peer-observer/scripts/bitcoin-node-entrypoint.sh /peer-observer/scripts/bitcoin-node-entrypoint.sh
 COPY --from=peer-observer-builder /peer-observer/scripts/bitcoin-node-healthcheck.sh /peer-observer/scripts/bitcoin-node-healthcheck.sh
 COPY --from=peer-observer-builder /peer-observer/target/release/ebpf-extractor /usr/local/bin/ebpf-extractor
-COPY --from=btc-core-builder /bitcoin/build/bin/ /shared/
 
 # Expose Bitcoin ports (RPC: 8332, P2P: 8333)
 EXPOSE 8332 8333
 
-# Set data directory and shared volume
+# Set data directory volume
 VOLUME /home/bitcoin/.bitcoin
-VOLUME /shared
 
 # Spawn bitcoin daemon
 WORKDIR /peer-observer

docker/bitcoin-node.dockerfile

@@ -7,7 +7,3 @@ include:
   - path: docker-compose/connectivity-check.yml
   - path: docker-compose/metrics.yml
   - path: docker-compose/websocket.yml
-  
-volumes:
-  bitcoin-data:
-  bitcoin-bin:

node.mainnet.yml

@@ -7,8 +7,3 @@ include:
   - path: docker-compose/connectivity-check.yml
   - path: docker-compose/metrics.yml
   - path: docker-compose/websocket.yml
-  
-volumes:
-  bitcoin-data:
-  bitcoin-bin:
-

node.regtest.yml

@@ -7,8 +7,3 @@ include:
   - path: docker-compose/connectivity-check.yml
   - path: docker-compose/metrics.yml
   - path: docker-compose/websocket.yml
-  
-volumes:
-  bitcoin-data:
-  bitcoin-bin:
-