diff --git a/Dockerfile b/Dockerfile index a5c1e5dd9..e2e019f5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && \ python3-setuptools \ python3-wheel \ python3-tk \ + python3-venv \ && \ apt-get clean && \ rm -rf /var/lib/apt/lists @@ -25,10 +26,6 @@ RUN apt-get update && \ # retrieve source code COPY . /vmaf -# install python requirements -RUN pip3 install --upgrade pip -RUN pip3 install --no-cache-dir meson cython numpy - # setup environment ENV PATH=/vmaf:/vmaf/libvmaf/build/tools:$PATH diff --git a/Makefile b/Makefile index 32c66efde..c902e7ba5 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,14 @@ VENV=.venv .PHONY: all install clean distclean deps all: deps - meson setup libvmaf/build libvmaf --buildtype release -Denable_float=true && \ - ninja -vC libvmaf/build && \ + $(VENV)/bin/meson setup libvmaf/build libvmaf --buildtype release -Denable_float=true && \ + $(VENV)/bin/ninja -vC libvmaf/build && \ cd python && \ ../$(VENV)/bin/python setup.py build_ext --build-lib . install: deps - meson setup libvmaf/build libvmaf --buildtype release && \ - ninja -vC libvmaf/build install + $(VENV)/bin/meson setup libvmaf/build libvmaf --buildtype release && \ + $(VENV)/bin/ninja -vC libvmaf/build install clean: rm -rf libvmaf/build