diff --git a/Makefile b/Makefile index 0d672f33..bf3320a9 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ CONTAINER_RUNTIME?=docker REVISION=$(shell git -c core.abbrev=no describe --always --exclude='*' --long --dirty) TAG?=latest -# Process images.json through the images-with-extras script +# Process images.json through the images-resolve-inherits and images-with-extras scripts IMAGE_JSON=.image.json -.image.json: images.json .scripts/images-with-extras .image.tag - < images.json jq '.[] | select(.tag == "$(TAG)") | [ . ]' | .scripts/images-with-extras | jq '.[]' > $@ +.image.json: images.json .scripts/images-resolve-inherits .scripts/images-with-extras .image.tag + < images.json .scripts/images-resolve-inherits | jq '.[] | select(.tag == "$(TAG)") | [ . ]' | .scripts/images-with-extras | jq '.[]' > $@ # Track TAG as a file so that .image.json regenerates when TAG changes .image.tag: FORCE