Merge pull request #14 from devilbox/improve-docker-pull

Be able to use variables

Author: cytopia

Makefile.docker

@@ -198,23 +198,18 @@ docker-load:
 # -------------------------------------------------------------------------------------------------
 .PHONY: docker-pull-base-image
 _DOCKER_PULL_BASE_IMAGES_FOUND = $(shell grep FROM $(DIR)/$(FILE) | sed 's/^FROM\s*//g' | sed 's/\s.*$$//g' | sort -u )
-_DOCKER_PULL_BASE_IMAGES_PULL = $(shell \
-	for img in $$( echo "$(_DOCKER_PULL_BASE_IMAGES_FOUND)" | sed 's/\s/\n/g' ); do \
-		if ! echo $(DOCKER_PULL_BASE_IMAGES_IGNORE) | grep -F "$${img}" >/dev/null; then \
-			echo "$${img}"; \
-		fi; \
-	done; \
-)
 docker-pull-base-image:
 	@echo "################################################################################"
 	@echo "# Pulling Base Image (platform: $(ARCH))"
 	@echo "################################################################################"
 	@echo "Docker File:   $(DIR)/$(FILE)"
 	@echo "Images Found:  $(_DOCKER_PULL_BASE_IMAGES_FOUND)"
 	@echo "Images Ignore: $(DOCKER_PULL_BASE_IMAGES_IGNORE)"
-	@echo "Images Actual: $(_DOCKER_PULL_BASE_IMAGES_PULL)"
 	@echo
-	@echo $(_DOCKER_PULL_BASE_IMAGES_PULL) | sed 's/\s/\n/g' | while read -r line; do \
+	@echo $(_DOCKER_PULL_BASE_IMAGES_FOUND) | sed 's/\s/\n/g' | while read -r line; do \
+		if echo "$(DOCKER_PULL_BASE_IMAGES_IGNORE)" | grep -F "$${line}" >/dev/null; then \
+			continue; \
+		fi; \
 		echo "docker pull --platform $(ARCH) $${line}"; \
 		SUCC=0; \
 		for count in $$(seq 10); do \