Merge pull request #446 from breakstring/main

优化Dockerfile --- 新年快乐

.dockerignore

@@ -1,4 +1,6 @@
 docs
 logs
 output
-reference
+reference
+SoVITS_weights
+.git

Dockerfile

@@ -2,7 +2,7 @@
 FROM cnstark/pytorch:2.0.1-py3.9.17-cuda11.8.0-ubuntu20.04
 
 LABEL maintainer="breakstring@hotmail.com"
-LABEL version="dev-20240127"
+LABEL version="dev-20240209"
 LABEL description="Docker image for GPT-SoVITS"
 
 
@@ -11,25 +11,34 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 RUN apt-get update && \
     apt-get install -y --no-install-recommends tzdata ffmpeg libsox-dev parallel aria2 git git-lfs && \
-    rm -rf /var/lib/apt/lists/* && \
-    git lfs install
+    git lfs install && \
+    rm -rf /var/lib/apt/lists/*
 
-# Copy application
+# Copy only requirements.txt initially to leverage Docker cache
 WORKDIR /workspace
+COPY requirements.txt /workspace/
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Define a build-time argument for image type
+ARG IMAGE_TYPE=full
+
+# Conditional logic based on the IMAGE_TYPE argument
+# Always copy the Docker directory, but only use it if IMAGE_TYPE is not "elite"
+COPY ./Docker /workspace/Docker 
+# elite 类型的镜像里面不包含额外的模型
+RUN if [ "$IMAGE_TYPE" != "elite" ]; then \
+        chmod +x /workspace/Docker/download.sh && \
+        /workspace/Docker/download.sh && \
+        python /workspace/Docker/download.py && \
+        python -m nltk.downloader averaged_perceptron_tagger cmudict; \
+    fi
+
+
+# Copy the rest of the application
 COPY . /workspace
 
-# install python packages
-RUN pip install -r requirements.txt
-
-# Download models
-RUN chmod +x /workspace/Docker/download.sh && /workspace/Docker/download.sh
-
-# Download moda ASR related
-RUN python /workspace/Docker/download.py
-
-# Download nltk realted
-RUN python -m nltk.downloader averaged_perceptron_tagger
-RUN python -m nltk.downloader cmudict
+# Copy the rest of the application
+COPY . /workspace
 
 
 EXPOSE 9870
@@ -42,4 +51,4 @@ VOLUME /workspace/output
 VOLUME /workspace/logs
 VOLUME /workspace/SoVITS_weights
 
-CMD ["python", "webui.py"]
+CMD ["python", "webui.py"]

dockerbuild.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# 获取当前日期，格式为 YYYYMMDD
+DATE=$(date +%Y%m%d)
+
+# 构建 full 版本的镜像
+docker build --build-arg IMAGE_TYPE=full -t breakstring/gpt-sovits:latest .
+# 为同一个镜像添加带日期的标签
+docker tag breakstring/gpt-sovits:latest breakstring/gpt-sovits:dev-$DATE
+
+# 构建 elite 版本的镜像
+docker build --build-arg IMAGE_TYPE=elite -t breakstring/gpt-sovits:latest-elite .
+# 为同一个镜像添加带日期的标签
+docker tag breakstring/gpt-sovits:latest-elite breakstring/gpt-sovits:dev-$DATE-elite