The only difference between fedora-winXX-cross.docker and
fedora.docker is the specific QEMU_CONFIGURE_OPTS environment
variable. All the rest can be inherited from the generic Fedora
image.
Basing the cross containers on the generic Fedora allows us to
- save registry/local storage
- use more tools in the cross container (ccache for example).
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
.gitlab-ci.d/containers.yml | 4 ++
tests/docker/Makefile.include | 2 +
.../dockerfiles/fedora-win32-cross.docker | 41 +------------------
.../dockerfiles/fedora-win64-cross.docker | 37 +----------------
4 files changed, 10 insertions(+), 74 deletions(-)
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 33e4046e233..1f7f82ece65 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -222,11 +222,15 @@ i386-fedora-cross-container:
win32-fedora-cross-container:
<<: *container_job_definition
+ stage: containers-layer2
+ needs: ['amd64-fedora-container']
variables:
NAME: fedora-win32-cross
win64-fedora-cross-container:
<<: *container_job_definition
+ stage: containers-layer2
+ needs: ['amd64-fedora-container']
variables:
NAME: fedora-win64-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 7cab761bf5b..5aa99df32ad 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -144,6 +144,8 @@ docker-image-debian-riscv64-cross: docker-image-debian10
docker-image-debian-s390x-cross: docker-image-debian10
docker-image-debian-sh4-cross: docker-image-debian10
docker-image-debian-sparc64-cross: docker-image-debian10
+docker-image-fedora-win32-cross: docker-image-fedora
+docker-image-fedora-win64-cross: docker-image-fedora
# Specialist build images, sometimes very limited tools
docker-image-debian-tricore-cross: docker-image-debian10
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 81b5659e9c5..425f05c3e98 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -1,41 +1,4 @@
-FROM fedora:33
-
-# Please keep this list sorted alphabetically
-ENV PACKAGES \
- bc \
- bzip2 \
- diffutils \
- findutils \
- gcc \
- gettext \
- git \
- hostname \
- make \
- meson \
- mingw32-bzip2 \
- mingw32-curl \
- mingw32-glib2 \
- mingw32-gmp \
- mingw32-gnutls \
- mingw32-gtk3 \
- mingw32-libjpeg-turbo \
- mingw32-libpng \
- mingw32-libtasn1 \
- mingw32-nettle \
- mingw32-nsis \
- mingw32-pixman \
- mingw32-pkg-config \
- mingw32-SDL2 \
- perl \
- perl-Test-Harness \
- python3 \
- python3-PyYAML \
- tar \
- which
-
-RUN dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
-ENV FEATURES mingw
+FROM qemu/fedora
# Specify the cross prefix for this image (see tests/docker/common.rc)
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
+ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index bcb428e7242..abdbce2a145 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,37 +1,4 @@
-FROM fedora:33
-
-# Please keep this list sorted alphabetically
-ENV PACKAGES \
- bc \
- bzip2 \
- diffutils \
- findutils \
- gcc \
- gettext \
- git \
- hostname \
- make \
- meson \
- mingw64-bzip2 \
- mingw64-curl \
- mingw64-glib2 \
- mingw64-gmp \
- mingw64-gtk3 \
- mingw64-libjpeg-turbo \
- mingw64-libpng \
- mingw64-libtasn1 \
- mingw64-pixman \
- mingw64-pkg-config \
- perl \
- perl-Test-Harness \
- python3 \
- python3-PyYAML \
- tar \
- which
-
-RUN dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
-ENV FEATURES mingw
+FROM qemu/fedora
# Specify the cross prefix for this image (see tests/docker/common.rc)
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone
+ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS
--cross-prefix=x86_64-w64-mingw32- --disable-capstone
--
2.26.2
