diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2020-08-04 12:23:26 +0100 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2020-08-04 12:23:26 +0100 |
commit | dc1dc11efeee852fa87e8ac4f0a451f2ad35afe9 (patch) | |
tree | 8ccf44b23d0d5dee7d625c39589eaed9e33a40c9 /ci/libvirt-centos-8.Dockerfile | |
parent | 2966ed608574097d6d795526051c40b00244fa72 (diff) | |
download | libvirt-python-dc1dc11efeee852fa87e8ac4f0a451f2ad35afe9.tar.gz |
ci: refresh dockerfiles for changed libvirt build system
Libvirt changed from autotools to meson. All the containers need
refreshing and the CI recipes updated.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'ci/libvirt-centos-8.Dockerfile')
-rw-r--r-- | ci/libvirt-centos-8.Dockerfile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ci/libvirt-centos-8.Dockerfile b/ci/libvirt-centos-8.Dockerfile index 3d0eb68..8715f4e 100644 --- a/ci/libvirt-centos-8.Dockerfile +++ b/ci/libvirt-centos-8.Dockerfile @@ -1,7 +1,7 @@ FROM centos:8 RUN dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled PowerTools -y && \ + dnf config-manager --set-enabled -y PowerTools && \ dnf install -y epel-release && \ dnf update -y && \ dnf install -y \ @@ -30,17 +30,18 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ libxslt \ lsof \ make \ - meson \ net-tools \ ninja-build \ patch \ perl \ + perl-App-cpanminus \ pkgconfig \ python3 \ python3-devel \ python3-docutils \ python3-lxml \ python3-nose \ + python3-pip \ python3-setuptools \ python3-wheel \ rpcgen \ @@ -48,13 +49,17 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ screen \ strace \ sudo \ - vim && \ + vim \ + xz && \ dnf autoremove -y && \ dnf clean all -y && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) +RUN pip3 install \ + meson==0.54.0 + ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" |