Dockerfile: adapt to new Makefile

Netflix · Mar 12, 2024 · ece4a99 · ece4a99
1 parent 4af3f5a
commit ece4a99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,17 +18,14 @@ RUN apt-get update && \
     python3-setuptools \
     python3-wheel \
     python3-tk \
+    python3-venv \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists
 
 # 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
@@ -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