From 74875553d52e92ec2629b0d67256e4f6392c6840 Mon Sep 17 00:00:00 2001 From: Oscar Pocock Date: Thu, 28 Apr 2022 22:15:33 +0100 Subject: [PATCH] Dockerfile installs from requirements.txt --- Dockerfile.cpu | 2 +- docker-compose.yaml | 2 +- requirements.txt | 27 ++------------------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/Dockerfile.cpu b/Dockerfile.cpu index f59efe9..f59600c 100644 --- a/Dockerfile.cpu +++ b/Dockerfile.cpu @@ -2,7 +2,7 @@ FROM python:3.8 RUN apt update -y -RUN apt install libgl1 -y +RUN apt install libgl1 -y # or install opencv opencv-python-headless instead RUN pip3 install \ torch==1.10.2+cpu \ diff --git a/docker-compose.yaml b/docker-compose.yaml index 705144c..657ce6c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,6 +8,6 @@ services: image: noble/autophotographer volumes: # Source of project - - ./src:/src + - .:/mmp-osp1 # Location of dataset - $HOME/Documents/Datasets:/datasets \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c9b69a2..fa7f531 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,29 +1,6 @@ -cycler==0.11.0 -fonttools==4.33.2 -imageio==2.17.0 -joblib==1.1.0 -kiwisolver==1.4.2 -matplotlib==3.5.1 -networkx==2.8 -numpy==1.22.3 opencv-python==4.5.5.64 -packaging==21.3 +matplotlib==3.5.1 pandas==1.4.2 -Pillow==9.0.1 -pyparsing==3.0.8 -python-dateutil==2.8.2 -pytz==2022.1 -PyWavelets==1.3.0 PyYAML==6.0 scikit-image==0.19.2 -scikit-learn==1.0.2 -scipy==1.8.0 -six==1.16.0 -sklearn==0.0 -threadpoolctl==3.1.0 -tifffile==2022.4.22 -torch==1.10.2+cpu -torchaudio==0.10.2+cpu -torchvision==0.11.3+cpu -tqdm==4.64.0 -typing_extensions==4.1.1 +tqdm==4.64.0 \ No newline at end of file