On Wed, Mar 03, 2021 at 01:42:22PM +0100, Philippe Mathieu-Daudé wrote: > 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.
This is relying on the base Fedora image already having the mingw packages installed. My series to automate creation of the container dockerfiles removes those entirely, so we have strictly separate native and mingw images for Fedora: https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg03123.html > 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(-) Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
