Makefile:

- "build" target was failing (circular dependency) - now it only checks
that the network is not running
docker-compose:
- update to use the latest api image
- use sha256 layers for all external images
- set variables for external images to make it easier to use differnet
  versions

Author: wileyj

Makefile

@@ -37,6 +37,7 @@ $(CHAINSTATE_DIR): /usr/bin/tar /usr/bin/zstd
 	fi
 
 # Boot the network from the local chainstate archive
+# up: check-not-running | $(CHAINSTATE_DIR)
 up: check-not-running | build $(CHAINSTATE_DIR)
 	@echo "Starting $(PROJECT) network from chainstate archive"
 	@echo "  Chainstate Dir: $(CHAINSTATE_DIR)"
@@ -72,18 +73,18 @@ down: backup-logs current-chainstate-dir
 # if the network is in a weird state - this target will force kill (bypassing error checks)
 down-force:
 	@echo "Force Shutting down $(PROJECT) network"
-	$(eval ACTIVE_CHAINSTATE_DIR=$(shell cat .current-chainstate-dir))
 	docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) down
 	@if [ -f .current-chainstate-dir ]; then \
 		rm -f .current-chainstate-dir
 	fi
+	sudo rm -rf ./docker/chainstate/*
 
 # Build the images with a cache if present
-build: down
+build: check-not-running
 	COMPOSE_BAKE=true PWD=$(PWD) docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) build
 
 # Build the images without a cache (default uses cache)
-build-no-cache: down
+build-no-cache: check-not-running
 	COMPOSE_BAKE=true PWD=$(PWD) docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) build --no-cache
 
 # Stream specified service logs to STDOUT. does not validate if PARAMS is supplied
@@ -201,7 +202,6 @@ check-params: | check-running
 
 # force stop and remove any existing chainstates (leaving all docker images/layers)
 clean: down-force
-	sudo rm -rf ./docker/chainstate/*
 
 
 .PHONY: up genesis up-genesis down-genesis down down-force build build-no-cache log log-all backup-logs current-chainstate-dir snapshot pause unpause stop start restart stress test monitor check-not-running check-running check-params clean

docker/docker-compose.yml

@@ -53,6 +53,11 @@ x-common-vars:
     - &BITCOIN_IP 10.0.0.250
     - &BITCOIN_MINER_IP 10.0.0.251
 
+    # External Docker Images
+    - &IMAGE_STACKS_API hirosystems/stacks-blockchain-api:8.13.0@sha256:8352985823154b41d38abab07c95b5b469450760c902210b3280bf5e8170d5f3
+    - &IMAGE_POSTGRES postgres:16.6-bookworm@sha256:c965017e1d29eb03e18a11abc25f5e3cd78cb5ac799d495922264b8489d5a3a1
+    - &IMAGE_BITCOIN bitcoin/bitcoin:25.2@sha256:14b4777166cba8de36b62ce72801038760a8f490122781b66d40592c8c69ebda
+
     # Bitcoin env vars
     - &BITCOIN_PEER_PORT 18444
     - &BITCOIN_RPC_PORT 18443
@@ -172,7 +177,8 @@ services:
     # --------------------
     bitcoin:
         container_name: bitcoin
-        image: bitcoin/bitcoin:25.2
+        # image: bitcoin/bitcoin:25.2
+        image: *IMAGE_BITCOIN
         ports:
             - "127.0.0.1:18443:18443"
             - "127.0.0.1:18444:18444"
@@ -198,7 +204,8 @@ services:
 
     bitcoin-miner:
         container_name: bitcoin-miner
-        image: bitcoin/bitcoin:25.2
+        # image: bitcoin/bitcoin:25.2
+        image: *IMAGE_BITCOIN
         depends_on:
             bitcoin:
                 condition: service_healthy
@@ -385,7 +392,8 @@ services:
     # Hiro API.
     # ------------------
     postgres:
-        image: postgres:16.6-bookworm@sha256:c965017e1d29eb03e18a11abc25f5e3cd78cb5ac799d495922264b8489d5a3a1
+        image: *IMAGE_POSTGRES
+        # image: postgres:16.6-bookworm@sha256:c965017e1d29eb03e18a11abc25f5e3cd78cb5ac799d495922264b8489d5a3a1
         container_name: postgres
         stop_grace_period: 5s
         volumes:
@@ -405,7 +413,8 @@ services:
                 ipv4_address: *POSTGRES_IP
 
     stacks-api:
-        image: hirosystems/stacks-blockchain-api:8.12.0
+        # image: hirosystems/stacks-blockchain-api:8.12.0
+        image: *IMAGE_STACKS_API
         container_name: stacks-api
         stop_grace_period: 5s
         ports: