Fix for docker build using latest Miniconda and Python 3.5 explicitly.

alexjc · Oct 29, 2016 · 74cb956 · 74cb956
1 parent 99c767b
commit 74cb956
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker-cpu.df b/docker-cpu.df
@@ -10,15 +10,15 @@ RUN apt-get -qq update           &&  \
     rm -rf /var/lib/apt/lists/*
 
 # Miniconda.
-RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.2.11-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh
 
 # Install requirements before copying project files
 WORKDIR /ne
 COPY requirements.txt .
 RUN /opt/conda/bin/conda install -q -y conda numpy scipy pip pillow
-RUN /opt/conda/bin/python3 -m pip install -q -r "requirements.txt"
+RUN /opt/conda/bin/python3.5 -m pip install -q -r "requirements.txt"
 
 # Copy only required project files
 COPY enhance.py .
@@ -29,4 +29,4 @@ RUN wget -q "https://github.com/alexjc/neural-enhance/releases/download/v0.1/ne4
 RUN wget -q "https://github.com/alexjc/neural-enhance/releases/download/v0.1/ne4x-large-0.1.pkl.bz2"
 
 # Set an entrypoint to the main doodle.py script
-ENTRYPOINT ["/opt/conda/bin/python3", "enhance.py", "--device=cpu"]
+ENTRYPOINT ["/opt/conda/bin/python3.5", "enhance.py", "--device=cpu"]
diff --git a/docker-gpu.df b/docker-gpu.df
@@ -10,15 +10,15 @@ RUN apt-get -qq update           &&  \
     rm -rf /var/lib/apt/lists/*
 
 # Miniconda.
-RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.2.11-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm ~/miniconda.sh
 
 # Install requirements before copying project files
 WORKDIR /ne
 COPY requirements.txt .
 RUN /opt/conda/bin/conda install -q -y conda numpy scipy pip pillow
-RUN /opt/conda/bin/python3 -m pip install -q -r "requirements.txt"
+RUN /opt/conda/bin/python3.5 -m pip install -q -r "requirements.txt"
 
 # Copy only required project files
 COPY enhance.py .
@@ -29,4 +29,4 @@ RUN wget -q "https://github.com/alexjc/neural-enhance/releases/download/v0.1/ne4
 RUN wget -q "https://github.com/alexjc/neural-enhance/releases/download/v0.1/ne4x-large-0.1.pkl.bz2"
 
 # Set an entrypoint to the main doodle.py script
-ENTRYPOINT ["/opt/conda/bin/python3", "enhance.py", "--device=gpu"]
+ENTRYPOINT ["/opt/conda/bin/python3.5", "enhance.py", "--device=gpu"]