AbdBarho/stable-diffusion-webui-docker
1
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2026-04-07 23:43:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into comfy-update-and-taesd-and-also-medvram-for-a1111

Browse source
This commit is contained in:
Steven Lu (5950X 20.04) 2023-08-13 03:17:26 -04:00
commit fc23291403
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -29,7 +29,7 @@ services:
<<: *base_service <<: *base_service
profiles: ["auto"] profiles: ["auto"]
build: ./services/AUTOMATIC1111 build: ./services/AUTOMATIC1111
image: sd-auto:62 image: sd-auto:63
environment: environment:
- CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api
@ -60,7 +60,7 @@ services:
<<: *base_service <<: *base_service
profiles: ["comfy"] profiles: ["comfy"]
build: ./services/comfy/ build: ./services/comfy/
image: sd-comfy:3 image: sd-comfy:4
environment: environment:
- CLI_ARGS=--preview-method=taesd - CLI_ARGS=--preview-method=taesd

5
services/AUTOMATIC1111/Dockerfile
View file

@ -12,8 +12,9 @@ RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba
&& rm -rf assets inputs && rm -rf assets inputs
RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9 RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9
RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git 5b3af030dd83e0297272d861c19477735d0317ec RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git c9fe758757e022f05ca5a53fa8fac28889e4f1cf
RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8 RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2486589f24165c8e3b303f84e9dbbea318df83e8
RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
FROM alpine:3.17 as xformers FROM alpine:3.17 as xformers
@ -71,7 +72,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
RUN apt-get -y install libgoogle-perftools-dev && apt-get clean RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
ENV LD_PRELOAD=libtcmalloc.so ENV LD_PRELOAD=libtcmalloc.so
ARG SHA=394ffa7b0a7fff3ec484bcd084e673a8b301ccc8 ARG SHA=68f336bd994bed5442ad95bad6b6ad5564a5409a
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
cd stable-diffusion-webui && \ cd stable-diffusion-webui && \
git fetch && \ git fetch && \

2
services/comfy/Dockerfile
View file

@ -30,6 +30,8 @@ ADD https://github.com/madebyollin/taesd/raw/main/taesdxl_decoder.pth \
# add info # add info
COPY . /docker/ COPY . /docker/
RUN cp /docker/extra_model_paths.yaml ${ROOT} RUN cp /docker/extra_model_paths.yaml ${ROOT}
RUN chmod u+x /docker/entrypoint.sh
RUN cp /docker/extra_model_paths.yaml ${ROOT}
ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_VISIBLE_DEVICES=all
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""

6
services/comfy/entrypoint.sh
View file

@ -22,4 +22,10 @@ for to_path in "${!MOUNTS[@]}"; do
echo Mounted $(basename "${from_path}") echo Mounted $(basename "${from_path}")
done done
if [ -f "/data/config/comfy/startup.sh" ]; then
pushd ${ROOT}
. /data/config/comfy/startup.sh
popd
fi
exec "$@" exec "$@"