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

main
Alex J. Champandard 9 years ago
parent 99c767b7e2
commit 74cb95609e

@ -10,7 +10,7 @@ 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
@ -18,7 +18,7 @@ RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.2.11-Linux-x86
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"]

@ -10,7 +10,7 @@ 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
@ -18,7 +18,7 @@ RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.2.11-Linux-x86
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"]

Loading…
Cancel
Save