diff --git a/docker-compose.yml b/docker-compose.yml index 3f81ee2af..681123fa1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: build: ./services/AUTOMATIC1111 image: sd-auto:63 environment: - - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api + - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api auto-cpu: <<: *automatic @@ -62,7 +62,7 @@ services: build: ./services/comfy/ image: sd-comfy:4 environment: - - CLI_ARGS= + - CLI_ARGS=--preview-method=taesd comfy-cpu: diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 1cc260057..9c55dcbe2 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -8,28 +8,24 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 RUN apt-get update && apt-get install -y git && apt-get clean +RUN --mount=type=cache,target=/root/.cache/pip \ + --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ + pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl + ENV ROOT=/stable-diffusion RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ cd ${ROOT} && \ git checkout master && \ - git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ + git reset --hard 91ed2815d542c96fdad75edba2205140de3cbba6 && \ pip install -r requirements.txt - -RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ - pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl - - WORKDIR ${ROOT} -ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f -RUN --mount=type=cache,target=/root/.cache/pip \ - git fetch && \ - git checkout ${BRANCH} && \ - git reset --hard ${SHA} && \ - pip install -r requirements.txt +ADD https://github.com/madebyollin/taesd/raw/main/taesd_decoder.pth \ + ${ROOT}/models/vae_approx/taesd_decoder.pth +ADD https://github.com/madebyollin/taesd/raw/main/taesdxl_decoder.pth \ + ${ROOT}/models/vae_approx/taesdxl_decoder.pth # add info COPY . /docker/