diff --git a/docker-compose.yml b/docker-compose.yml index 9c88e49..2645dad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:23 + image: sd-auto:24 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index ab53581..ada957c 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -26,7 +26,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr FROM alpine:3 as xformers RUN apk add aria2 -RUN aria2c -x 10 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/3.1.0/xformers-0.0.15.dev0+4e3631d.d20221125-cp310-cp310-linux_x86_64.whl' +RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/4.0.0/xformers-0.0.16rc393-cp310-cp310-manylinux2014_x86_64.whl' FROM python:3.10-slim @@ -46,10 +46,9 @@ git reset --hard 98947d173e3f1667eba29c904f681047dea9de90 pip install -r requirements_versions.txt EOF - -COPY --from=xformers /wheel.whl xformers-0.0.15-cp310-cp310-linux_x86_64.whl -RUN pip install xformers-0.0.15-cp310-cp310-linux_x86_64.whl && rm xformers-0.0.15-cp310-cp310-linux_x86_64.whl - +RUN --mount=type=cache,target=/root/.cache/pip \ + --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \ + pip install triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl ENV ROOT=/stable-diffusion-webui @@ -78,7 +77,7 @@ pip install -r requirements_versions.txt EOF RUN --mount=type=cache,target=/root/.cache/pip \ - pip install opencv-python-headless transformers==4.24 + pip install -U opencv-python-headless transformers>=4.24 COPY . /docker