Skip to content

Commit

Permalink
fix conflict in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
bearney74 committed Apr 3, 2017
2 parents cbb0571 + 1c16e6d commit 9317774
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ RUN pip install imageio numpy scipy matplotlib pandas sympy nose decorator tqdm
# install scikit-image after the other deps, it doesn't cause errors this way.
RUN pip install scikit-image sklearn

# install from github since there are bugs in latest versions.
ADD . /var/src/moviepy/
#RUN git clone https://github.com/Zulko/moviepy.git /var/src/moviepy
RUN cd /var/src/moviepy/ && python setup.py install

# install ffmpeg from imageio.
RUN python -c "import imageio; imageio.plugins.ffmpeg.download()"

#add soft link so that ffmpeg can executed (like usual) from command line
RUN ln -s /root/.imageio/ffmpeg/ffmpeg.linux64 /usr/bin/ffmpeg

# modify ImageMagick policy file so that Textclips work correctly.
Expand Down

0 comments on commit 9317774

Please sign in to comment.