From: Daniel P. Berrange Date: Tue, 16 Jan 2018 13:42:17 +0000 (+0000) Subject: docker: change Fedora images to run with python3 X-Git-Tag: v2.12.0-rc0~111^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=356dc290f0ef930a24b6af3a0908b1cb58ad47c9;p=thirdparty%2Fqemu.git docker: change Fedora images to run with python3 Fedora has switched to Python 3 by default, so it makes sense to use that for testing QEMU builds, so we get testing of Python 3 compatibility. Signed-off-by: Daniel P. Berrange Message-Id: <20180116134217.8725-15-berrange@redhat.com> Signed-off-by: Eduardo Habkost --- diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 32de7316758..26ede4f1d6b 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:latest ENV PACKAGES \ - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \ + ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils libaio-devel \ nettle-devel libasan libubsan \ @@ -12,6 +12,7 @@ ENV PACKAGES \ mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ mingw64-bzip2 +ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt