File tree Expand file tree Collapse file tree 1 file changed +4
-9
lines changed
Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Original file line number Diff line number Diff line change @@ -198,23 +198,18 @@ docker-load:
198198# -------------------------------------------------------------------------------------------------
199199.PHONY: docker-pull-base-image
200200_DOCKER_PULL_BASE_IMAGES_FOUND = $(shell grep FROM $(DIR)/$(FILE) | sed 's/^FROM\s*//g' | sed 's/\s.*$$//g' | sort -u )
201- _DOCKER_PULL_BASE_IMAGES_PULL = $(shell \
202- for img in $$( echo "$(_DOCKER_PULL_BASE_IMAGES_FOUND)" | sed 's/\s/\n/g' ); do \
203- if ! echo $(DOCKER_PULL_BASE_IMAGES_IGNORE) | grep -F "$${img}" >/dev/null; then \
204- echo "$${img}"; \
205- fi; \
206- done; \
207- )
208201docker-pull-base-image:
209202 @echo "################################################################################"
210203 @echo "# Pulling Base Image (platform: $(ARCH))"
211204 @echo "################################################################################"
212205 @echo "Docker File: $(DIR)/$(FILE)"
213206 @echo "Images Found: $(_DOCKER_PULL_BASE_IMAGES_FOUND)"
214207 @echo "Images Ignore: $(DOCKER_PULL_BASE_IMAGES_IGNORE)"
215- @echo "Images Actual: $(_DOCKER_PULL_BASE_IMAGES_PULL)"
216208 @echo
217- @echo $(_DOCKER_PULL_BASE_IMAGES_PULL) | sed 's/\s/\n/g' | while read -r line; do \
209+ @echo $(_DOCKER_PULL_BASE_IMAGES_FOUND) | sed 's/\s/\n/g' | while read -r line; do \
210+ if echo "$(DOCKER_PULL_BASE_IMAGES_IGNORE)" | grep -F "$${line}" >/dev/null; then \
211+ continue; \
212+ fi; \
218213 echo "docker pull --platform $(ARCH) $${line}"; \
219214 SUCC=0; \
220215 for count in $$(seq 10); do \
You can’t perform that action at this time.
0 commit comments