dockerfile: Install Meson from upstream tarball

This is because the meson build requires meson 0.47, which is not
available in the current Ubuntu LTS (18.04).

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 8ec6fd1ec2d9834de291339c1696e21862115f89..ea2f4ea89c6799186a25d27d3f6390b05b4053f0 100644 (file)
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -42,10 +42,17 @@ RUN apt-get update && apt-get install -y \
     libxml2-utils \
     libxtst-dev \
     make \
-    meson \
     ninja-build \
     systemd
 
+# Install meson from upstream tarball
+ARG MESON_VERSION=0.47.0
+RUN apt-get install -y wget && \
+    wget -q https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz && \
+    tar -xf meson-${MESON_VERSION}.tar.gz && \
+    cd meson-${MESON_VERSION} && \
+    python3 setup.py install
+
 # Add a user and set as default for the build. This is safer, in general, and
 # allows us to avoid having to explicitly allow running as root in the
 # check-daemon stage.