AbdBarho/stable-diffusion-webui-docker
1
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2026-02-07 16:14:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/run-as-non-root

Browse source
This commit is contained in:
Seth Moore 2023-07-26 08:44:10 -04:00 committed by GitHub
parent a5367ace32 09a0f11946
commit bac12e210a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-compose.yml
View file

@ -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= - CLI_ARGS=

2
services/AUTOMATIC1111/Dockerfile
View file

@ -12,7 +12,7 @@ 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

2
services/comfy/Dockerfile
View file

@ -34,6 +34,8 @@ RUN --mount=type=cache,target=/root/.cache/pip \
# 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 "$@"