Specify python requirements explicitly on each Dockerfile.

Otherwise, we need a different requirement file for each docker configuration.

Author: paulinus

Dockerfile

@@ -2,7 +2,6 @@ FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Install apt-getable dependencies
 RUN apt-get update \
     && apt-get install -y \
         build-essential \
@@ -22,10 +21,28 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN pip3 install \
+        cloudpickle==0.4.0 \
+        exifread==2.1.2 \
+        flask==2.3.2 \
+        fpdf2==2.4.6 \
+        joblib==0.14.1 \
+        matplotlib \
+        networkx==2.5 \
+        numpy>=1.19 \
+        Pillow>=8.1.1 \
+        pyproj>=1.9.5.1 \
+        pytest==3.0.7 \
+        python-dateutil>=2.7 \
+        pyyaml>=5.4 \
+        scipy>=1.10.0 \
+        Sphinx==4.2.0 \
+        xmltodict==0.10.2 \
+        wheel \
+        opencv-python
 
 COPY . /source/OpenSfM
 
 WORKDIR /source/OpenSfM
 
-RUN pip3 install -r requirements.txt && \
-    python3 setup.py build
+RUN python3 setup.py build

Dockerfile.ceres2

@@ -2,7 +2,6 @@ FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Install apt-getable dependencies
 RUN apt-get update \
     && apt-get install -y \
         build-essential \
@@ -24,6 +23,27 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
+RUN pip3 install \
+        cloudpickle==0.4.0 \
+        exifread==2.1.2 \
+        flask==2.3.2 \
+        fpdf2==2.4.6 \
+        joblib==0.14.1 \
+        matplotlib \
+        networkx==2.5 \
+        numpy>=1.19 \
+        Pillow>=8.1.1 \
+        pyproj>=1.9.5.1 \
+        pytest==3.0.7 \
+        python-dateutil>=2.7 \
+        pyyaml>=5.4 \
+        scipy>=1.10.0 \
+        Sphinx==4.2.0 \
+        xmltodict==0.10.2 \
+        wheel \
+        opencv-python
+
+
 # Install Ceres 2
 RUN \
     mkdir -p /source && cd /source && \
@@ -39,5 +59,4 @@ COPY . /source/OpenSfM
 
 WORKDIR /source/OpenSfM
 
-RUN pip3 install -r requirements.txt && \
-    python3 setup.py build
+RUN python3 setup.py build

Dockerfile.ubuntu22

@@ -2,7 +2,6 @@ FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Install apt-getable dependencies
 RUN apt-get update \
     && apt-get install -y \
         build-essential \
@@ -22,10 +21,27 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN pip3 install \
+        cloudpickle==3.1.1 \
+        ExifRead==3.3.1 \
+        Flask==3.1.1 \
+        fpdf2==2.8.3 \
+        joblib==1.5.1 \
+        matplotlib==3.5.1 \
+        networkx==3.4.2 \
+        numpy==1.21.5 \
+        opencv-python==4.11.0.86 \
+        Pillow==9.0.1 \
+        pyproj==3.3.0 \
+        pytest==8.4.0 \
+        python-dateutil==2.8.1 \
+        PyYAML==5.4.1 \
+        scipy==1.8.0 \
+        Sphinx==4.2.0 \
+        xmltodict==0.14.2
 
 COPY . /source/OpenSfM
 
 WORKDIR /source/OpenSfM
 
-RUN pip3 install -r requirements.txt && \
-    python3 setup.py build
+RUN python3 setup.py build