Commit ef8f3283 authored by John Snow's avatar John Snow Committed by Alex Bennée
Browse files

docker: remove 'deprecated' image definitions 



There isn't a debian.dockerfile anymore,
so perform some ghost-busting.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Message-Id: <20190923181140.7235-4-jsnow@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent afa1cf43

tests/docker/Makefile.include

+3 −4
Original line number Diff line number Diff line
@@ -4,11 +4,10 @@ 


DOCKER_SUFFIX := .docker

DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles

DOCKER_DEPRECATED_IMAGES := debian

# we don't run tests on intermediate images (used as base by another image)

DOCKER_PARTIAL_IMAGES := debian debian9 debian10 debian-sid

DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid

DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap

DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))

DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))

DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))

# Use a global constant ccache directory to speed up repetitive builds

DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -158,7 +157,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user 
DOCKER_USER_IMAGES += debian-powerpc-user



# Expand all the pre-requistes for each docker image and test combination

$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \

$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \

	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \

		$(eval .PHONY: docker-$t@$i) \

		$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \