diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 0df273f..ac0556f 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -36,6 +36,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # add info COPY . /docker/ +RUN cp /docker/extra_model_paths.yaml ${ROOT} ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh index 6dc794f..f9faf7c 100755 --- a/services/comfy/entrypoint.sh +++ b/services/comfy/entrypoint.sh @@ -2,40 +2,12 @@ set -Eeuo pipefail -declare -A MOUNTS - - mkdir -vp /data/config/comfy/ -# cache +declare -A MOUNTS + MOUNTS["/root/.cache"]="/data/.cache" - -# ui specific -MOUNTS["${ROOT}/models/checkpoints"]="/data/StableDiffusion" -MOUNTS["${ROOT}/models/controlnet"]="/data/ControlNet" -MOUNTS["${ROOT}/models/vae"]="/data/VAE" -MOUNTS["${ROOT}/models/loras"]="/data/Lora" -MOUNTS["${ROOT}/models/embeddings"]="/data/embeddings" -MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks" - -MOUNTS["${ROOT}/models/upscale_models/RealESRGAN"]="/data/RealESRGAN" -MOUNTS["${ROOT}/models/upscale_models/GFPGAN"]="/data/GFPGAN" -MOUNTS["${ROOT}/models/upscale_models/SwinIR"]="/data/SwinIR" - -# config -# TODO: I am not sure if this is final, maybe it should change in the future MOUNTS["${ROOT}/input"]="/data/config/comfy/input" -MOUNTS["${ROOT}/custom_nodes"]="/data/config/comfy/custom_nodes" -MOUNTS["${ROOT}/models/configs"]="/data/config/comfy/configs" - -MOUNTS["${ROOT}/models/style_models"]="/data/config/comfy/models/style_models" -MOUNTS["${ROOT}/models/t2i_adapter"]="/data/config/comfy/models/t2i_adapter" -MOUNTS["${ROOT}/models/clip"]="/data/config/comfy/models/clip" -MOUNTS["${ROOT}/models/clip_vision"]="/data/config/comfy/models/clip_vision" -MOUNTS["${ROOT}/models/gligen"]="/data/config/comfy/models/gligen" -MOUNTS["${ROOT}/models/diffusers"]="/data/config/comfy/models/diffusers" - -# output MOUNTS["${ROOT}/output"]="/output/comfy" for to_path in "${!MOUNTS[@]}"; do diff --git a/services/comfy/extra_model_paths.yaml b/services/comfy/extra_model_paths.yaml new file mode 100644 index 0000000..ba27ae2 --- /dev/null +++ b/services/comfy/extra_model_paths.yaml @@ -0,0 +1,24 @@ +a111: + base_path: /data + + checkpoints: StableDiffusion + configs: StableDiffusion + vae: VAE + loras: Lora + upscale_models: | + RealESRGAN + ESRGAN + SwinIR + GFPGAN + embeddings: embeddings + hypernetworks: Hypernetworks + controlnet: ControlNet + gligen: GLIGEN + custom_nodes: config/comfy/custom_nodes + + # TODO: I am unsure about these, need more testing + # clip: .cache/clip + # style_models: config/comfy/style_models + # t2i_adapter: config/comfy/t2i_adapter + # clip_vision: config/comfy/clip_vision + # diffusers: config/comfy/diffusers