From 99f93f93a6073058238eef3d7a98bcd779f1eeab Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Fri, 2 Jun 2023 01:58:33 +0900
Subject: [PATCH] update

---
 docker_vcclient/Dockerfile | 31 +++++--------------------------
 start_docker.sh            | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/docker_vcclient/Dockerfile b/docker_vcclient/Dockerfile
index 51505aa1..56578354 100644
--- a/docker_vcclient/Dockerfile
+++ b/docker_vcclient/Dockerfile
@@ -37,34 +37,10 @@ RUN apt-get update \
         && apt-get clean \
         && rm -rf /var/lib/apt/lists/*
 
-RUN pip install uvicorn==0.21.1
-RUN pip install pyOpenSSL==23.1.1
-RUN pip install numpy==1.23.5
-RUN pip install torch==1.13.1
-RUN pip install resampy==0.4.2
-RUN pip install python-socketio==5.8.0
-RUN pip install fastapi==0.95.1
-RUN pip install python-multipart==0.0.6
-RUN pip install onnxruntime-gpu==1.14.1
-RUN pip install pyworld==0.3.3
-RUN pip install scipy==1.10.1
-RUN pip install matplotlib==3.7.1
-RUN pip install fairseq==0.12.2
-RUN pip install websockets==11.0.2
-RUN pip install praat-parselmouth==0.4.3
-RUN pip install faiss-cpu==1.7.3
-RUN pip install torchcrepe==0.0.18
-RUN pip install librosa==0.10.0.post1
-RUN pip install gin==0.1.6
-RUN pip install gin_config==0.5.0
-RUN pip install einops==0.6.0
-RUN pip install local_attention==1.8.5
-RUN pip install websockets==11.0.2
-
 WORKDIR /
 ADD dummy /
 
-RUN git clone https://github.com/w-okada/voice-changer.git -b v.1.5.2
+RUN git clone https://github.com/w-okada/voice-changer.git -b v.1.5.3.4
 
 
 ADD /setup.sh  /voice-changer/server
@@ -72,6 +48,7 @@ ADD /exec.sh  /voice-changer/server
 
 RUN chmod 0777 /voice-changer/server
 WORKDIR /voice-changer/server
+RUN pip install -r requirements.txt
 
 RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v13
 RUN cd MMVC_Client_v13 && git checkout 04f3fec4fd82dea6657026ec4e1cd80fb29a415c && cd -
@@ -80,9 +57,11 @@ RUN git clone https://github.com/isletennos/MMVC_Client.git MMVC_Client_v15
 RUN cd MMVC_Client_v15 && git checkout 461cb231b57cbb17243110eaac8435d9cca24a26 && cd -
 
 RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40
+RUN cd so-vits-svc-40 && git checkout 293fe0bc03a583df17846c715c179152745c1b8d && cd -
 RUN git clone https://github.com/StarStringStudio/so-vits-svc.git so-vits-svc-40v2
 RUN cd so-vits-svc-40v2 && git checkout 08c70ff3d2f7958820b715db2a2180f4b7f92f8d && cd -
 RUN git clone https://github.com/yxlllc/DDSP-SVC.git DDSP-SVC
+RUN cd DDSP-SVC && git checkout e716efb14aee747492bc6ac1deb07506c26ed550 && cd -
 RUN git clone https://github.com/liujing04/Retrieval-based-Voice-Conversion-WebUI.git RVC
-
+RUN cd RVC && git checkout 563c64ded9925085f547b13ecafb8eb9c182952b && cd -
 ENTRYPOINT ["/bin/bash", "setup.sh"]
diff --git a/start_docker.sh b/start_docker.sh
index 5871e08c..9ee921a0 100644
--- a/start_docker.sh
+++ b/start_docker.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-DOCKER_IMAGE=dannadori/vcclient:20230429_071012
+DOCKER_IMAGE=dannadori/vcclient:20230602_014557
 #DOCKER_IMAGE=vcclient
 
 ### DEFAULT VAR ###
@@ -28,10 +28,12 @@ if [ "${USE_GPU}" = "on" ]; then
     -e LOCAL_GID=$(id -g $USER) \
     -p ${EX_PORT}:18888 \
     $DOCKER_IMAGE -p 18888 --https true \
-    --content_vec_500 checkpoint_best_legacy_500.pt \
-    --hubert_base hubert_base.pt \
-    --hubert_soft hubert-soft-0d54a1f4.pt \
-    --nsf_hifigan nsf_hifigan/model 
+        --content_vec_500 pretrain/checkpoint_best_legacy_500.pt  \
+        --hubert_base pretrain/hubert_base.pt \
+        --hubert_soft pretrain/hubert/hubert-soft-0d54a1f4.pt \
+        --nsf_hifigan pretrain/nsf_hifigan/model \
+        --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \
+        --model_dir model_dir
 else
     echo "VC Client start...(cpu)"
     docker run -it --rm --shm-size=1024M \
@@ -42,10 +44,12 @@ else
     -e LOCAL_GID=$(id -g $USER) \
     -p ${EX_PORT}:18888 \
     $DOCKER_IMAGE -p 18888 --https true \
-    --content_vec_500 checkpoint_best_legacy_500.pt \
-    --hubert_base hubert_base.pt \
-    --hubert_soft hubert-soft-0d54a1f4.pt \
-    --nsf_hifigan nsf_hifigan/model
+        --content_vec_500 pretrain/checkpoint_best_legacy_500.pt  \
+        --hubert_base pretrain/hubert_base.pt \
+        --hubert_soft pretrain/hubert/hubert-soft-0d54a1f4.pt \
+        --nsf_hifigan pretrain/nsf_hifigan/model \
+        --hubert_base_jp pretrain/rinna_hubert_base_jp.pt \
+        --model_dir model_dir
 fi