Skip to content
This repository was archived by the owner on Dec 10, 2023. It is now read-only.

Commit e73eb85

Browse files
xychelseaxychelsea
committed
Incorporating updates to base containers for CUDA 11.4 and ffmpeg as well as jupyter kernel management
1 parent f15593f commit e73eb85

File tree

5 files changed

+87
-65
lines changed

5 files changed

+87
-65
lines changed

‎Dockerfile‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

17-
FROM xychelsea/anaconda3:v0.3
17+
FROM xychelsea/anaconda3:v0.4.1
1818
LABEL description="DeepFaceLab Vanilla Container"
1919

2020
# $ docker build --network=host -t xychelsea/deepfacelab:latest -f Dockerfile .
@@ -52,21 +52,22 @@ WORKDIR ${HOME}
5252
# Update Anaconda
5353
RUN conda update -c defaults conda
5454

55-
# Install DeepFaceLab
56-
RUN conda create -c main -n deepfacelab python=3.7
57-
58-
RUN conda run -n deepfacelab pip3 install \
59-
tqdm \
60-
numpy==1.19.3 \
61-
h5py==2.10.0 \
62-
opencv-python==4.1.0.25 \
63-
ffmpeg-python==0.1.17 \
64-
scikit-image==0.14.2 \
65-
scipy==1.4.1 \
66-
colorama \
67-
tensorflow==2.4.0 \
68-
pyqt5
69-
55+
# Create environment and install dependencies
56+
RUN conda create -n deepfacelab -c conda-forge python=3.7 \
57+
&& conda run -n deepfacelab pip3 install \
58+
tqdm \
59+
numpy==1.19.3 \
60+
h5py==2.10.0 \
61+
opencv-python==4.1.0.25 \
62+
ffmpeg-python==0.1.17 \
63+
scikit-image==0.14.2 \
64+
scipy==1.4.1 \
65+
colorama \
66+
tensorflow==2.4.0 \
67+
pyqt5 \
68+
&& conda clean -afy
69+
70+
# Install rife from github repo
7071
RUN git clone git://github.com/xychelsea/deepfacelab.git ${DEEPFACELAB_PATH} \
7172
&& mkdir -p ${DEEPFACELAB_WORKSPACE} \
7273
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging

‎Dockerfile.jupyter‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

17-
FROM xychelsea/anaconda3:v0.3-jupyter
17+
FROM xychelsea/anaconda3:v0.4.1-jupyter
1818
LABEL description="DeepFaceLab Vanilla Container w/ Jupyter Notebooks"
1919

2020
# $ docker build --network=host -t xychelsea/deepfacelab:latest-jupyter -f Dockerfile.jupyter .
@@ -52,21 +52,29 @@ WORKDIR ${HOME}
5252
# Update Anaconda
5353
RUN conda update -c defaults conda
5454

55-
# Install DeepFaceLab
56-
RUN conda create -c main -n deepfacelab python=3.7
57-
58-
RUN conda run -n deepfacelab pip3 install \
59-
tqdm \
60-
numpy==1.19.3 \
61-
h5py==2.10.0 \
62-
opencv-python==4.1.0.25 \
63-
ffmpeg-python==0.1.17 \
64-
scikit-image==0.14.2 \
65-
scipy==1.4.1 \
66-
colorama \
67-
tensorflow==2.4.0 \
68-
pyqt5
55+
# Create environment and install dependencies
56+
RUN conda create -n deepfacelab -c conda-forge python=3.7 \
57+
&& conda run -n deepfacelab pip3 install \
58+
tqdm \
59+
numpy==1.19.3 \
60+
h5py==2.10.0 \
61+
opencv-python==4.1.0.25 \
62+
ffmpeg-python==0.1.17 \
63+
scikit-image==0.14.2 \
64+
scipy==1.4.1 \
65+
colorama \
66+
tensorflow==2.4.0 \
67+
pyqt5 \
68+
&& conda clean -afy
69+
70+
# Install Jupyter Notebook
71+
RUN conda install -n ${ANACONDA_ENV} -c conda-forge \
72+
ipykernel \
73+
&& conda run -n ${ANACONDA_ENV} ipython kernel install --user --name=${ANACONDA_ENV} \
74+
&& conda clean -afy \
75+
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging
6976

77+
# Install rife from github repo
7078
RUN git clone git://github.com/xychelsea/deepfacelab.git ${DEEPFACELAB_PATH} \
7179
&& mkdir -p ${DEEPFACELAB_WORKSPACE} \
7280
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging

‎Dockerfile.nvidia‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

17-
FROM xychelsea/ffmpeg-nvidia:v0.3
17+
FROM xychelsea/ffmpeg-nvidia:v0.4.1
1818
LABEL description="DeepFaceLab GPU Container"
1919

2020
# $ docker build --network=host -t xychelsea/deepfacelab:latest-gpu -f Dockerfile.nvidia .
@@ -52,21 +52,22 @@ WORKDIR ${HOME}
5252
# Update Anaconda
5353
RUN conda update -c defaults conda
5454

55-
# Install DeepFaceLab
56-
RUN conda create -c nvidia -n deepfacelab python=3.7 cudnn=8.0.4 cudatoolkit=11.0.221
57-
58-
RUN conda run -n deepfacelab pip3 install \
59-
tqdm \
60-
numpy==1.19.3 \
61-
h5py==2.10.0 \
62-
opencv-python==4.1.0.25 \
63-
ffmpeg-python==0.1.17 \
64-
scikit-image==0.14.2 \
65-
scipy==1.4.1 \
66-
colorama \
67-
tensorflow-gpu==2.4.0 \
68-
pyqt5
69-
55+
# Create environment and install dependencies
56+
RUN conda create -c nvidia -n deepfacelab python=3.7 cudnn=8.0.4 cudatoolkit=11.0.221 \
57+
&& conda run -n deepfacelab pip3 install \
58+
tqdm \
59+
numpy==1.19.3 \
60+
h5py==2.10.0 \
61+
opencv-python==4.1.0.25 \
62+
ffmpeg-python==0.1.17 \
63+
scikit-image==0.14.2 \
64+
scipy==1.4.1 \
65+
colorama \
66+
tensorflow-gpu==2.4.0 \
67+
pyqt5 \
68+
&& conda clean -afy
69+
70+
# Install rife from github repo
7071
RUN git clone git://github.com/xychelsea/deepfacelab.git ${DEEPFACELAB_PATH} \
7172
&& mkdir -p ${DEEPFACELAB_WORKSPACE} \
7273
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging

‎Dockerfile.nvidia-jupyter‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

17-
FROM xychelsea/ffmpeg-nvidia:v0.3-jupyter
17+
FROM xychelsea/ffmpeg-nvidia:v0.4.1-jupyter
1818
LABEL description="DeepFaceLab GPU Container w/ Jupyter Notebooks"
1919

2020
# $ docker build --network=host -t xychelsea/deepfacelab:latest-gpu-jupyter -f Dockerfile.nvidia-jupyter .
@@ -23,7 +23,7 @@ LABEL description="DeepFaceLab GPU Container w/ Jupyter Notebooks"
2323

2424
ENV ANACONDA_ENV=deepfacelab
2525
ENV DEEPFACELAB_PATH=/usr/local/deepfacelab
26-
ENV DEEPFACELAB_PYTHON=python3.8
26+
ENV DEEPFACELAB_PYTHON=python3.7
2727
ENV DEEPFACELAB_HOME=${HOME}/deepfacelab
2828
ENV DEEPFACELAB_WORKSPACE=${DEEPFACELAB_PATH}/workspace
2929
ENV DEEPFACELAB_SCRIPTS=${DEEPFACELAB_PATH}/scripts
@@ -52,21 +52,33 @@ WORKDIR ${HOME}
5252
# Update Anaconda
5353
RUN conda update -c defaults conda
5454

55-
# Install DeepFaceLab
56-
RUN conda create -c nvidia -n deepfacelab python=3.7 cudnn=8.0.4 cudatoolkit=11.0.221
57-
58-
RUN conda run -n deepfacelab pip3 install \
59-
tqdm \
60-
numpy==1.19.3 \
61-
h5py==2.10.0 \
62-
opencv-python==4.1.0.25 \
63-
ffmpeg-python==0.1.17 \
64-
scikit-image==0.14.2 \
65-
scipy==1.4.1 \
66-
colorama \
67-
tensorflow-gpu==2.4.0 \
68-
pyqt5
69-
55+
# Create environment and install dependencies
56+
RUN conda create -n deepfacelab -c nvidia \
57+
python \
58+
cudnn \
59+
cudatoolkit \
60+
&& conda clean -afy
61+
62+
#RUN conda run -n deepfacelab pip3 install \
63+
# tqdm \
64+
# numpy==1.19.3 \
65+
# h5py==2.10.0 \
66+
# opencv-python==4.1.0.25 \
67+
# ffmpeg-python==0.1.17 \
68+
# scikit-image==0.14.2 \
69+
# scipy==1.4.1 \
70+
# colorama \
71+
# tensorflow-gpu==2.4.0 \
72+
# pyqt5
73+
74+
# Install Jupyter Notebook
75+
RUN conda install -n ${ANACONDA_ENV} -c conda-forge \
76+
ipykernel \
77+
&& conda run -n ${ANACONDA_ENV} ipython kernel install --user --name=${ANACONDA_ENV} \
78+
&& conda clean -afy \
79+
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging
80+
81+
# Install deepfacelab from github repo
7082
RUN git clone git://github.com/xychelsea/deepfacelab.git ${DEEPFACELAB_PATH} \
7183
&& mkdir -p ${DEEPFACELAB_WORKSPACE} \
7284
&& rm -rvf ${ANACONDA_PATH}/share/jupyter/lab/staging

‎version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3
1+
v0.4.1

0 commit comments

Comments
 (0)