Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dockerfile and requirements to pin versions #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.cpu
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# https://github.com/plippe/faiss-docker/blob/master/Dockerfile
FROM nvidia/cuda:8.0-devel-ubuntu16.04
FROM --platform=linux/amd64 nvidia/cuda:11.8.0-devel-ubuntu22.04

ENV FAISS_CPU_OR_GPU "cpu"
ENV FAISS_VERSION "1.3.0"
ENV OPENCV_VERSION "3.4.8"

RUN apt-get update && apt-get install -y curl bzip2 libgl1-mesa-glx

RUN curl https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh > /tmp/conda.sh
RUN curl -L https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh > /tmp/conda.sh
RUN bash /tmp/conda.sh -b -p /opt/conda && \
/opt/conda/bin/conda update -n base conda && \
/opt/conda/bin/conda install -y -c pytorch faiss-${FAISS_CPU_OR_GPU}=${FAISS_VERSION} && \
Expand Down Expand Up @@ -38,7 +38,7 @@ RUN apt-get update -y && \
libpq-dev \
libopenblas-dev \
liblapack3 \
python-dev \
python2-dev \
swig \
git \
python-pip \
Expand Down
2 changes: 1 addition & 1 deletion launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docker run \
--rm \
--name $CONTAINER_NAME \
--mount type=bind,source="$(pwd)",target=/project \
--mount type=bind,source="$HOME/Dropbox/Camera Uploads/",target=/pics \
--mount type=bind,source="$HOME/",target=/pics \
-p "$PORT:$PORT/tcp" \
-e "DISPLAY=$IP:0" \
mosaic-conda:latest \
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ scikit-image==0.14.0
moviepy==0.2.3.5
tqdm==4.26.0
dlib
imutils
imutils==0.5.3
imageio<2.7