Merge branch 'master' of github.com:storytold/storyteller-web

This commit is contained in:
Brandon Thomas committed 2021-05-31 14:42:20 -04:00
commit 6f1cf06dd6
2 files changed
+97 -64

No files matched your search

+96 -60
View File
@@ -1,64 +1,96 @@
# ==================== Python Build Base ====================
FROM ghcr.io/storytold/docker-base-images-nvidia-cuda-experimental:080f96bc7087 as pybuild-base
#FROM nvidia/cuda:10.1-devel-ubuntu18.04 as pybuild-base
FROM nvidia/cuda:11.3.0-devel-ubuntu20.04 as pybuild-base
# tzdata install hangs without presetting the time zone
ENV TZ=UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# NB(2021-05-30): This is the image that Tacotron 2's Dockerfile specifies.
# I have not tried this, but it might be necessary.
#FROM pytorch/pytorch:nightly-devel-cuda10.0-cudnn7
#ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
# NB: https://github.com/NVIDIA/nvidia-docker/issues/864#issuecomment-439848887
# NB: We do not install ffmpeg, since the version is 3.8.* series and we need 4.2.*
## Authenticating with GHCR locally:
## https://docs.github.com/en/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry
## ```
## export CR_PAT=YOUR_TOKEN
## echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
## ```
#
# NB(2021-05-30): We need to install `cython3` for building modern Tacotron 2
# dependencies (ie. protoc) on old Ubuntu
# RUN apt-get update \
# && apt-get install -y \
RUN apt-get update
#RUN apt-cache search python3.8
# ffmpeg version 4.2.4-1ubuntu0.1 Copyright (c) 2000-2020 the FFmpeg developers
#RUN apt-get install -y ffmpeg
#RUN ffmpeg -version
#RUN sleep 100
RUN apt-get install -y \
build-essential \
curl \
cython3 \
ffmpeg \
g++-7 \
gcc-7 \
git \
htop \
imagemagick \
libc++-7-dev \
libffi-dev \
libgcc-7-dev \
libmagic1 \
libsm6 \
libsndfile1 \
libssl-dev \
libxext6 \
libxrender-dev \
netcat \
python-dev \
python3-pip \
python3.8 \
python3.8-dev \
python3.8-venv\
redis-tools \
silversearcher-ag \
sox \
tmux \
vim \
wget
##FROM nvidia/cuda:10.1-devel-ubuntu18.04 as pybuild-base
#FROM nvidia/cuda:11.3.0-devel-ubuntu20.04 as pybuild-base
#
## tzdata install hangs without presetting the time zone
#ENV TZ=UTC
#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
#
## NB(2021-05-30): This is the image that Tacotron 2's Dockerfile specifies.
## I have not tried this, but it might be necessary.
##FROM pytorch/pytorch:nightly-devel-cuda10.0-cudnn7
##ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
#
## NB: https://github.com/NVIDIA/nvidia-docker/issues/864#issuecomment-439848887
## NB: We do not install ffmpeg, since the version is 3.8.* series and we need 4.2.*
##
## NB(2021-05-30): We need to install `cython3` for building modern Tacotron 2
## dependencies (ie. protoc) on old Ubuntu
## RUN apt-get update \
## && apt-get install -y \
#RUN apt-get update
##RUN apt-cache search python3.8
#
## NB: Here we install nvidia drivers
## NB: Avoid keyboard prompt
#RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nvidia-384 --no-install-recommends
#
## ffmpeg version 4.2.4-1ubuntu0.1 Copyright (c) 2000-2020 the FFmpeg developers
##RUN apt-get install -y ffmpeg
##RUN ffmpeg -version
##RUN sleep 100
#
## Notes on packages:
## * software-properties-common - needed for `apt-add-repository`
## * pciutils - needed for `lspci | grep -i nvidia`
#RUN apt-get install -y \
# build-essential \
# curl \
# cython3 \
# ffmpeg \
# g++-7 \
# gcc-7 \
# git \
# htop \
# imagemagick \
# libc++-7-dev \
# libffi-dev \
# libgcc-7-dev \
# libmagic1 \
# libsm6 \
# libsndfile1 \
# libssl-dev \
# libxext6 \
# libxrender-dev \
# netcat \
# pciutils \
# python-dev \
# python3-pip \
# python3.8 \
# python3.8-dev \
# python3.8-venv\
# redis-tools \
# silversearcher-ag \
# software-properties-common \
# sox \
# tmux \
# vim \
# wget
#
#
## Wav2Lip needs Python3.6
## NB: we install python3-virtualenv as `python3.6 -m venv` won't work anymore
#RUN add-apt-repository ppa:deadsnakes/ppa
#RUN apt-get update
#RUN apt-get install -y python3.6
#RUN apt-get install -y python3-virtualenv
#RUN apt-get install -y python3.6-venv
#RUN apt-get install -y python3.6-dev
##RUN apt-get install python3-virtualenv
#
#
#RUN python3.6 --version
#RUN python3.8 --version
# We need ffmpeg version >= 4.2 (https://superuser.com/a/579110)
# http://ubuntuhandbook.org/index.php/2020/06/install-ffmpeg-4-3-via-ppa-ubuntu-18-04-16-04/
@@ -73,17 +105,21 @@ RUN apt-get install -y \
FROM pybuild-base as pybuild-requirements
WORKDIR /
COPY models/Wav2Lip ./models/Wav2Lip
WORKDIR models/Wav2Lip
RUN python3.8 --version
RUN python3.8 -m venv python
# NB: We need Python3.6
RUN python3.6 -m venv python
#RUN virtualenv -p /usr/bin/python3.6 ... wait
RUN . python/bin/activate \
&& pip install --upgrade pip \
&& pip install -r requirements.txt \
&& deactivate
WORKDIR /
COPY models/tacotron2 ./models/tacotron2
WORKDIR models/tacotron2
+1 -4
View File
@@ -2,12 +2,9 @@ librosa==0.7.0
numba==0.48
numpy==1.17.1
opencv-contrib-python==4.2.0.34
opencv-python==4.1.0.25
python-magic==0.4.22
tensorflow==1.12.0
torch==1.1.0
torchvision==0.3.0
tqdm==4.45.0
# NB(bt, 2021-05-30): After upgrading ubuntu, the old opencv package isn't available
#opencv-python==4.1.0.25
opencv-python==4.1.2.30