update makefile to use images-with-extras script and sha references

Author: leighmcculloch

.github/workflows/build.yml

@@ -245,7 +245,7 @@ jobs:
         echo "$(<<< $image_json jq -r '.deps[] | "\(.name)=\(.id)"')" | tee -a $GITHUB_OUTPUT
     - name: Write Image Config
       run: |
-        echo "$image_json" > image.json
+        echo "$image_json" > .image.json
     - name: Download Image XDR
       uses: actions/download-artifact@v4
       with:

.gitignore

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

Dockerfile

@@ -42,7 +42,7 @@ RUN adduser --system --group --quiet --home /var/lib/stellar --disabled-password
 RUN ["mkdir", "-p", "/opt/stellar"]
 RUN ["touch", "/opt/stellar/.docker-ephemeral"]
 
-ADD image.json /image.json
+ADD .image.json /image.json
 
 RUN ["rm", "-fr", "/etc/supervisor"]
 RUN ["ln", "-sT", "/opt/stellar/supervisor/etc", "/etc/supervisor"]

Makefile

@@ -3,21 +3,26 @@ __PHONY__: run logs console build build-deps build-deps-xdr build-deps-core buil
 REVISION=$(shell git -c core.abbrev=no describe --always --exclude='*' --long --dirty)
 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)
+# Process images.json through the images-with-extras script
+IMAGE_JSON=.image.json
+.image.json: images.json .scripts/images-with-extras
+	< images.json .scripts/images-with-extras | jq '.[] | select(.tag == "$(TAG)")' > $@
+
+# Extract configuration from selected image
+PROTOCOL_VERSION_DEFAULT = $(shell < $(IMAGE_JSON) jq -r '.config.protocol_version_default')
+XDR_REPO =       $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "xdr") | .repo')
+XDR_SHA =        $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "xdr") | .sha')
+CORE_REPO =      $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "core") | .repo')
+CORE_SHA =       $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "core") | .sha')
+CORE_OPTIONS =   $(shell < $(IMAGE_JSON) jq -c '.deps[] | select(.name == "core") | .options // {}')
+RPC_REPO =       $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "rpc") | .repo')
+RPC_SHA =        $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "rpc") | .sha')
+HORIZON_REPO =   $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "horizon") | .repo')
+HORIZON_SHA =    $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "horizon") | .sha')
+FRIENDBOT_REPO = $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "friendbot") | .repo')
+FRIENDBOT_SHA =  $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "friendbot") | .sha')
+LAB_REPO =       $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "lab") | .repo')
+LAB_SHA =        $(shell < $(IMAGE_JSON) jq -r '.deps[] | select(.name == "lab") | .sha')
 
 run:
 	docker run --rm --name stellar -p 8000:8000 stellar/quickstart:$(TAG) --local
@@ -28,35 +33,34 @@ logs:
 console:
 	docker exec -it stellar /bin/bash
 
-build:
-	< images.json jq -c --arg tag '$(TAG)' '.[] | select(.tag == $$tag)' > image.json
+build: $(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 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 LAB_IMAGE_REF=stellar-lab:$(LAB_REF)
+	  --build-arg XDR_IMAGE_REF=stellar-xdr:$(XDR_SHA) \
+	  --build-arg CORE_IMAGE_REF=stellar-core:$(CORE_SHA) \
+	  --build-arg RPC_IMAGE_REF=stellar-rpc:$(RPC_SHA) \
+	  --build-arg HORIZON_IMAGE_REF=stellar-horizon:$(HORIZON_SHA) \
+	  --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:$(FRIENDBOT_SHA) \
+	  --build-arg LAB_IMAGE_REF=stellar-lab:$(LAB_SHA)
 
 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-xdr: $(IMAGE_JSON)
+	docker build -t stellar-xdr:$(XDR_SHA) -f Dockerfile.xdr . --build-arg REPO="$(XDR_REPO)" --build-arg REF="$(XDR_SHA)"
 
-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 OPTIONS='$(CORE_OPTIONS)'
+build-deps-core: $(IMAGE_JSON)
+	docker build -t stellar-core:$(CORE_SHA) -f Dockerfile.core . --build-arg REPO="$(CORE_REPO)" --build-arg REF="$(CORE_SHA)" --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-rpc: $(IMAGE_JSON)
+	docker build -t stellar-rpc:$(RPC_SHA) -f Dockerfile.rpc . --build-arg=REPO="$(RPC_REPO)" --build-arg REF="$(RPC_SHA)"
 
-build-deps-horizon:
-	docker build -t stellar-horizon:$(HORIZON_REF) -f Dockerfile.horizon . --build-arg REPO="$(HORIZON_REPO)" --build-arg REF="$(HORIZON_REF)"
+build-deps-horizon: $(IMAGE_JSON)
+	docker build -t stellar-horizon:$(HORIZON_SHA) -f Dockerfile.horizon . --build-arg REPO="$(HORIZON_REPO)" --build-arg REF="$(HORIZON_SHA)"
 
-build-deps-friendbot:
-	docker build -t stellar-friendbot:$(FRIENDBOT_REF) -f Dockerfile.friendbot . --build-arg REPO="$(FRIENDBOT_REPO)" --build-arg REF="$(FRIENDBOT_REF)"
+build-deps-friendbot: $(IMAGE_JSON)
+	docker build -t stellar-friendbot:$(FRIENDBOT_SHA) -f Dockerfile.friendbot . --build-arg REPO="$(FRIENDBOT_REPO)" --build-arg REF="$(FRIENDBOT_SHA)"
 
-build-deps-lab:
-	docker build -t stellar-lab:$(LAB_REF) -f Dockerfile.lab . --build-arg REPO="$(LAB_REPO)" --build-arg NEXT_PUBLIC_COMMIT_HASH=$(LAB_REF)
+build-deps-lab: $(IMAGE_JSON)
+	docker build -t stellar-lab:$(LAB_SHA) -f Dockerfile.lab . --build-arg REPO="$(LAB_REPO)" --build-arg NEXT_PUBLIC_COMMIT_HASH=$(LAB_SHA)