diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index e5dc604..83c53ad 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -7,7 +7,7 @@ FROM python:3.10.9-slim ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 -RUN apt-get update && apt-get install -y git aria2 && apt-get clean +RUN apt-get update && apt-get install -y git aria2 build-essential && apt-get clean RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip \ aria2c -x 5 --dir /cache --out torch-2.0.0-cp310-cp310-linux_x86_64.whl -c \ diff --git a/services/comfy/entrypoint.sh b/services/comfy/entrypoint.sh index 8161566..2518818 100755 --- a/services/comfy/entrypoint.sh +++ b/services/comfy/entrypoint.sh @@ -44,16 +44,16 @@ for to_path in "${!MOUNTS[@]}"; do echo Mounted $(basename "${from_path}") done -if [ "$(ls -A /stable-diffusion/custom_nodes)" ]; then - chmod 777 -R "/stable-diffusion/custom_nodes/" - apt-get install build-essential -y - for dir in "/stable-diffusion/custom_nodes/*"; do - if [ -e "$dir/requirements.txt" ]; then - echo $dir - cd $dir - pip install -r requirements.txt - fi - done +if [ -f "/data/config/comfy/startup.sh" ]; then + pushd ${ROOT} + . /data/config/comfy/startup.sh + popd fi +shopt -s nullglob +list=(${ROOT}/custom_nodes/*/requirements.txt) +for req in "${list[@]}"; do + pip install -r "$req" +done + exec "$@"