diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2022-10-17 16:22:52 +0200 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2022-10-17 17:56:04 +0200 |
| commit | beb5b5a2d55f2ac745c5382b90072ee4a779f1ed (patch) | |
| tree | cae37752cbaef1186841c91f4d51c6b0397490f3 /tests | |
| parent | fbd8b4a052005e10e60a4ae4bb79423e01cdcd37 (diff) | |
ci: Use fdo templates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/centos7-meson/Dockerfile | 11 | ||||
| -rwxr-xr-x | tests/docker/centos7-meson/pip-installs.sh | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/tests/docker/centos7-meson/Dockerfile b/tests/docker/centos7-meson/Dockerfile index 694e34e..59a7c63 100644 --- a/tests/docker/centos7-meson/Dockerfile +++ b/tests/docker/centos7-meson/Dockerfile @@ -15,13 +15,8 @@ FROM centos:centos7 RUN yum -y update; yum clean all -RUN yum -y install git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind; yum clean all -RUN yum -y install net-tools; yum clean all +RUN yum -y install git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind net-tools centos-release-scl graphviz +ADD pip-installs.sh / +RUN bash -ex /pip-installs.sh && rm /pip-installs.sh -RUN yum -y install centos-release-scl ; yum clean all -RUN yum -y install rh-python36; yum clean all -RUN scl enable rh-python36 "pip3 install meson" - -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; yum clean all -RUN yum -y install ninja-build; yum clean all diff --git a/tests/docker/centos7-meson/pip-installs.sh b/tests/docker/centos7-meson/pip-installs.sh new file mode 100755 index 0000000..b8a4d18 --- /dev/null +++ b/tests/docker/centos7-meson/pip-installs.sh @@ -0,0 +1,11 @@ +#/bin/sh + +set -ex + +yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +yum -y install rh-python36 lcov + +scl enable rh-python36 "pip3 install meson==0.60.3" +scl enable rh-python36 "pip3 install ninja" + +yum clean all |