diff options
| author | Alex Bennée | 2022-09-14 17:59:50 +0200 |
|---|---|---|
| committer | Alex Bennée | 2022-09-20 18:22:08 +0200 |
| commit | d996f0aeb2fe8f5c5f30ac8a2f633e3196457d6f (patch) | |
| tree | 5ddc550616c6e5a4e8e6a2ca0387d8cac85662f6 /tests/docker/Makefile.include | |
| parent | tests/docker: remove FROM qemu/ support from docker.py (diff) | |
| download | qemu-d996f0aeb2fe8f5c5f30ac8a2f633e3196457d6f.tar.gz qemu-d996f0aeb2fe8f5c5f30ac8a2f633e3196457d6f.tar.xz qemu-d996f0aeb2fe8f5c5f30ac8a2f633e3196457d6f.zip | |
tests/docker: remove the Debian base images
We no longer use these in any of our images. Clean-up the remaining
comments and documentation that reference them and remove from the
build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220914155950.804707-31-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a3174346da..270e99786e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -69,9 +69,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) -# Enforce dependencies for composite images -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 +# Special case cross-compiling x86_64 on non-x86_64 systems. ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else @@ -89,10 +87,6 @@ endif # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= -# base images should not add a local user -docker-image-debian10: NOUSER=1 -docker-image-debian11: NOUSER=1 - # alpine has no adduser docker-image-alpine: NOUSER=1 |