update makefile to use json config and add rpc dependency

Author: leighmcculloch

.gitignore

@@ -0,0 +1 @@
+/image.json

Makefile

@@ -1,82 +1,62 @@
-__PHONY__: run logs build build-deps build-deps-core build-deps-horizon build-deps-friendbot build-deps-stellar-rpc
+__PHONY__: run logs console build build-deps build-deps-xdr build-deps-core build-deps-horizon build-deps-friendbot build-deps-rpc build-deps-lab
 
 REVISION=$(shell git -c core.abbrev=no describe --always --exclude='*' --long --dirty)
-TAG?=dev
-PROTOCOL_VERSION_DEFAULT?=22
-XDR_REPO?=stellar/rs-stellar-xdr
-XDR_REF?=main
-CORE_REPO?=stellar/stellar-core
-CORE_REF?=master
-CORE_CONFIGURE_FLAGS?=--disable-tests
-STELLAR_RPC_REF?=main
-HORIZON_REF?=master
-FRIENDBOT_REF?=$(HORIZON_REF)
-LAB_REF?=main
+TAG?=latest
+
+# Extract configuration from images.json
+PROTOCOL_VERSION_DEFAULT = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .config.protocol_version_default' images.json)
+XDR_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "xdr") | .repo' images.json)
+XDR_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "xdr") | .ref' images.json)
+CORE_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "core") | .repo' images.json)
+CORE_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "core") | .ref' images.json)
+CORE_OPTIONS = $(shell jq -c '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "core") | .options // {}' images.json)
+RPC_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "rpc") | .repo' images.json)
+RPC_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "rpc") | .ref' images.json)
+HORIZON_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "horizon") | .repo' images.json)
+HORIZON_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "horizon") | .ref' images.json)
+FRIENDBOT_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "friendbot") | .repo' images.json)
+FRIENDBOT_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "friendbot") | .ref' images.json)
+LAB_REPO = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "lab") | .repo' images.json)
+LAB_REF = $(shell jq -r '.[] | select(.tag == "$(TAG)") | .deps[] | select(.name == "lab") | .ref' images.json)
 
 run:
-	docker run --rm --name stellar -p 8000:8000 stellar/quickstart:$(TAG) --local --enable-stellar-rpc
+	docker run --rm --name stellar -p 8000:8000 stellar/quickstart:$(TAG) --local
 
 logs:
 	docker exec stellar /bin/sh -c 'tail -F /var/log/supervisor/*'
 
 console:
 	docker exec -it stellar /bin/bash
 
-build-latest:
-	$(MAKE) build TAG=latest \
-		PROTOCOL_VERSION_DEFAULT=23 \
-		XDR_REF=v23.0.0 \
-		CORE_REF=v23.0.1 \
-		HORIZON_REF=horizon-v23.0.0 \
-		STELLAR_RPC_REF=v23.0.4 \
-		FRIENDBOT_REF=horizon-v23.0.0
-
-build-testing:
-	$(MAKE) build TAG=testing \
-		PROTOCOL_VERSION_DEFAULT=23 \
-		XDR_REF=v23.0.0 \
-		CORE_REF=v23.0.1 \
-		HORIZON_REF=horizon-v23.0.0 \
-		STELLAR_RPC_REF=v23.0.4 \
-		FRIENDBOT_REF=horizon-v23.0.0
-
-build-future:
-	$(MAKE) build TAG=future \
-		PROTOCOL_VERSION_DEFAULT=23 \
-		XDR_REF=v23.0.0 \
-		CORE_REF=v23.0.1 \
-		HORIZON_REF=horizon-v23.0.0 \
-		STELLAR_RPC_REF=v23.0.4 \
-		FRIENDBOT_REF=horizon-v23.0.0
-
 build:
-	$(MAKE) -j 4 build-deps
+	< images.json jq -c --arg tag '$(TAG)' '.[] | select(.tag == $$tag)' > image.json
+	$(MAKE) build-deps
 	docker build -t stellar/quickstart:$(TAG) -f Dockerfile . \
 	  --build-arg REVISION=$(REVISION) \
 	  --build-arg PROTOCOL_VERSION_DEFAULT=$(PROTOCOL_VERSION_DEFAULT) \
-	  --build-arg STELLAR_XDR_IMAGE_REF=stellar-xdr:$(XDR_REF) \
-	  --build-arg STELLAR_CORE_IMAGE_REF=stellar-core:$(CORE_REF) \
+	  --build-arg XDR_IMAGE_REF=stellar-xdr:$(XDR_REF) \
+	  --build-arg CORE_IMAGE_REF=stellar-core:$(CORE_REF) \
+	  --build-arg RPC_IMAGE_REF=stellar-rpc:$(RPC_REF) \
 	  --build-arg HORIZON_IMAGE_REF=stellar-horizon:$(HORIZON_REF) \
 	  --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:$(FRIENDBOT_REF) \
-	  --build-arg STELLAR_RPC_IMAGE_REF=stellar-rpc:$(STELLAR_RPC_REF) \
 	  --build-arg LAB_IMAGE_REF=stellar-lab:$(LAB_REF)
 
-build-deps: build-deps-xdr build-deps-core build-deps-horizon build-deps-friendbot build-deps-stellar-rpc build-deps-lab
+build-deps: build-deps-xdr build-deps-rpc build-deps-horizon build-deps-friendbot build-deps-lab build-deps-core
 
 build-deps-xdr:
 	docker build -t stellar-xdr:$(XDR_REF) -f Dockerfile.xdr . --build-arg REPO="$(XDR_REPO)" --build-arg REF="$(XDR_REF)"
 
 build-deps-core:
-	docker build -t stellar-core:$(CORE_REF) -f Dockerfile.core . --build-arg REPO="$(CORE_REPO)" --build-arg REF="$(CORE_REF)" --build-arg CONFIGURE_FLAGS="$(CORE_CONFIGURE_FLAGS)"
+	docker build -t stellar-core:$(CORE_REF) -f Dockerfile.core . --build-arg REPO="$(CORE_REPO)" --build-arg REF="$(CORE_REF)" --build-arg OPTIONS='$(CORE_OPTIONS)'
+
+build-deps-rpc:
+	docker build -t stellar-rpc:$(RPC_REF) -f Dockerfile.rpc . --build-arg=REPO="$(RPC_REPO)" --build-arg REF="$(RPC_REF)"
 
 build-deps-horizon:
-	docker build -t stellar-horizon:$(HORIZON_REF) -f Dockerfile.horizon . --build-arg REF="$(HORIZON_REF)"
+	docker build -t stellar-horizon:$(HORIZON_REF) -f Dockerfile.horizon . --build-arg REPO="$(HORIZON_REPO)" --build-arg REF="$(HORIZON_REF)"
 
 build-deps-friendbot:
-	docker build -t stellar-friendbot:$(FRIENDBOT_REF) -f Dockerfile.friendbot . --build-arg REF="$(FRIENDBOT_REF)"
-
-build-deps-stellar-rpc:
-	docker build -t stellar-rpc:$(STELLAR_RPC_REF) -f Dockerfile.rpc . --build-arg REF="$(STELLAR_RPC_REF)"
+	docker build -t stellar-friendbot:$(FRIENDBOT_REF) -f Dockerfile.friendbot . --build-arg REPO="$(FRIENDBOT_REPO)" --build-arg REF="$(FRIENDBOT_REF)"
 
 build-deps-lab:
-	docker build -t stellar-lab:$(LAB_REF) -f Dockerfile.lab . --build-arg NEXT_PUBLIC_COMMIT_HASH=$(LAB_REF)
+	docker build -t stellar-lab:$(LAB_REF) -f Dockerfile.lab . --build-arg REPO="$(LAB_REPO)" --build-arg NEXT_PUBLIC_COMMIT_HASH=$(LAB_REF)