mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
07056db1b5
commit
d996f0aeb2
|
@ -10,8 +10,3 @@ amd64-fedora-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
variables:
|
variables:
|
||||||
NAME: fedora
|
NAME: fedora
|
||||||
|
|
||||||
amd64-debian10-container:
|
|
||||||
extends: .container_job_template
|
|
||||||
variables:
|
|
||||||
NAME: debian10
|
|
||||||
|
|
|
@ -7,11 +7,6 @@ amd64-alpine-container:
|
||||||
variables:
|
variables:
|
||||||
NAME: alpine
|
NAME: alpine
|
||||||
|
|
||||||
amd64-debian11-container:
|
|
||||||
extends: .container_job_template
|
|
||||||
variables:
|
|
||||||
NAME: debian11
|
|
||||||
|
|
||||||
amd64-debian-container:
|
amd64-debian-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
stage: containers
|
stage: containers
|
||||||
|
|
|
@ -375,7 +375,7 @@ locally by using the ``NOCACHE`` build option:
|
||||||
|
|
||||||
.. code::
|
.. code::
|
||||||
|
|
||||||
make docker-image-debian10 NOCACHE=1
|
make docker-image-debian-arm64-cross NOCACHE=1
|
||||||
|
|
||||||
Images
|
Images
|
||||||
~~~~~~
|
~~~~~~
|
||||||
|
|
|
@ -69,9 +69,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
|
||||||
{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
|
{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
|
||||||
"CHECK", "debian-$* exists"))
|
"CHECK", "debian-$* exists"))
|
||||||
|
|
||||||
# Enforce dependencies for composite images
|
# Special case cross-compiling x86_64 on non-x86_64 systems.
|
||||||
# we don't run tests on intermediate images (used as base by another image)
|
|
||||||
DOCKER_PARTIAL_IMAGES := debian10 debian11
|
|
||||||
ifeq ($(HOST_ARCH),x86_64)
|
ifeq ($(HOST_ARCH),x86_64)
|
||||||
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
|
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
|
||||||
else
|
else
|
||||||
|
@ -89,10 +87,6 @@ endif
|
||||||
# The native build should never use the registry
|
# The native build should never use the registry
|
||||||
docker-image-debian-native: DOCKER_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
|
# alpine has no adduser
|
||||||
docker-image-alpine: NOUSER=1
|
docker-image-alpine: NOUSER=1
|
||||||
|
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
#
|
|
||||||
# Docker multiarch cross-compiler target
|
|
||||||
#
|
|
||||||
# This docker target is builds on Debian cross compiler targets to build distro
|
|
||||||
# with a selection of cross compilers for building test binaries.
|
|
||||||
#
|
|
||||||
# On its own you can't build much but the docker-foo-cross targets
|
|
||||||
# build on top of the base debian image.
|
|
||||||
#
|
|
||||||
FROM docker.io/library/debian:buster-slim
|
|
||||||
|
|
||||||
# Duplicate deb line as deb-src
|
|
||||||
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
|
|
||||||
|
|
||||||
# Install common build utilities
|
|
||||||
RUN apt update && \
|
|
||||||
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
|
|
||||||
DEBIAN_FRONTEND=noninteractive eatmydata \
|
|
||||||
apt install -y --no-install-recommends \
|
|
||||||
bc \
|
|
||||||
build-essential \
|
|
||||||
ca-certificates \
|
|
||||||
ccache \
|
|
||||||
clang \
|
|
||||||
dbus \
|
|
||||||
gdb-multiarch \
|
|
||||||
gettext \
|
|
||||||
git \
|
|
||||||
libffi-dev \
|
|
||||||
libncurses5-dev \
|
|
||||||
ninja-build \
|
|
||||||
pkg-config \
|
|
||||||
psmisc \
|
|
||||||
python3 \
|
|
||||||
python3-sphinx \
|
|
||||||
python3-sphinx-rtd-theme \
|
|
||||||
python3-venv \
|
|
||||||
$(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
|
|
|
@ -1,18 +0,0 @@
|
||||||
#
|
|
||||||
# Docker multiarch cross-compiler target
|
|
||||||
#
|
|
||||||
# This docker target uses the current development version of Debian as
|
|
||||||
# a base for cross compilers for building test binaries. We won't
|
|
||||||
# attempt to build QEMU on it yet given it is still in development.
|
|
||||||
#
|
|
||||||
# On its own you can't build much but the docker-foo-cross targets
|
|
||||||
# build on top of the base debian image.
|
|
||||||
#
|
|
||||||
FROM docker.io/library/debian:bullseye-slim
|
|
||||||
|
|
||||||
# Duplicate deb line as deb-src
|
|
||||||
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
|
|
||||||
|
|
||||||
# Install common build utilities
|
|
||||||
RUN apt update && \
|
|
||||||
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
|
|
Loading…
Reference in New Issue