diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2018-01-16 13:42:17 +0000 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-02-05 19:53:55 -0200 |
| commit | 356dc290f0ef930a24b6af3a0908b1cb58ad47c9 (patch) | |
| tree | 7d795041f163747d78ec13ed6a9fb69848f0172d /tests/docker | |
| parent | 8e73a3c5fc0b57c3b7b4f3f79135570cb41d84a4 (diff) | |
| download | qemu-356dc290f0ef930a24b6af3a0908b1cb58ad47c9.zip qemu-356dc290f0ef930a24b6af3a0908b1cb58ad47c9.tar.gz qemu-356dc290f0ef930a24b6af3a0908b1cb58ad47c9.tar.bz2 | |
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 <berrange@redhat.com>
Message-Id: <20180116134217.8725-15-berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/fedora.docker | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 32de731..26ede4f 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 |