Commit 1b7fab22 authored by Arnaud Rebillout's avatar Arnaud Rebillout Committed by Arun Raghavan

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's avatarArnaud Rebillout <arnaud.rebillout@collabora.com>
parent 40e72e02
Pipeline #12533 passed with stage
in 13 minutes and 29 seconds
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment