From 75a68c7e0f45884fcbe06e516f35bded5722fe25 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 26 Apr 2023 05:45:28 -0700 Subject: [PATCH] install python --- Dockerfile | 8 ++++++++ .../job/download_job/config/download-job.development.env | 1 + .../vc/so_vits_svc/so_vits_svc_inference_command.rs | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb4c533a9e..6f4737ca2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -234,5 +234,13 @@ COPY crates/service/job/inference_job/config/inference-job.production.env . COPY crates/service/web/storyteller_web/config/storyteller-web.common.env . COPY crates/service/web/storyteller_web/config/storyteller-web.production.env . +# Need python to make use of other containers' venv +RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \ + python3-pip \ + python3.10 \ + python3.10-venv \ + --no-install-recommends \ + && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/{apt,dpkg,cache,log}/ + EXPOSE 8080 CMD LD_LIBRARY_PATH=/usr/lib /storyteller-web diff --git a/crates/service/job/download_job/config/download-job.development.env b/crates/service/job/download_job/config/download-job.development.env index e7ec037a1e..ca6a95b9dc 100644 --- a/crates/service/job/download_job/config/download-job.development.env +++ b/crates/service/job/download_job/config/download-job.development.env @@ -18,6 +18,7 @@ SOFTVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE=a79106991ce3 SO_VITS_SVC_MODEL_CHECK_ROOT_DIRECTORY="/models/voice_conversion/so-vits-svc" SO_VITS_SVC_MODEL_CHECK_COMMAND="python3 -m so_vits_svc_fork.fakeyou_infer" +#SO_VITS_SVC_MODEL_CHECK_COMMAND="/common/so-vits-svc-code/install/python/bin/python3.10 -m so_vits_svc_fork.fakeyou_infer" #SO_VITS_SVC_MODEL_CHECK_MAYBE_VENV_COMMAND="source python/bin/activate" SO_VITS_SVC_MODEL_CHECK_MAYBE_DOCKER_IMAGE="8acacf30bb2e" diff --git a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/so_vits_svc_inference_command.rs b/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/so_vits_svc_inference_command.rs index 917a729368..f1db93bc96 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/so_vits_svc_inference_command.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/so_vits_svc_inference_command.rs @@ -127,7 +127,7 @@ impl SoVitsSvcInferenceCommand { let maybe_environment_variables = if docker_env_vars.is_empty() { None } else { Some(docker_env_vars) }; - + DockerOptions { image_name, maybe_bind_mount: Some(DockerFilesystemMount::tmp_to_tmp()),