AbdBarho/stable-diffusion-webui-docker
1
0
Fork 0
mirror of https://github.com/AbdBarho/stable-diffusion-webui-docker.git synced 2026-03-20 12:04:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/env-override-support

Browse source
This commit is contained in:
Mat 2023-07-11 01:16:11 +02:00
parent 43be71142c 103e11493b
commit 97a687b509
No known key found for this signature in database
GPG key ID: 120EBFC87CE63728
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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:59 image: sd-auto:62
environment: environment:
- CLI_ARGS=${WEBUI_ARGS:---allow-code --medvram --xformers --enable-insecure-extension-access --api} - CLI_ARGS=${WEBUI_ARGS:---allow-code --medvram --xformers --enable-insecure-extension-access --api}

4
services/AUTOMATIC1111/Dockerfile
View file

@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
# we need those # we need those
apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 \ apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 \
# extensions needs those # extensions needs those
ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip \
@ -71,7 +71,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=20ae71faa8ef035c31aa3a410b707d792c8203a3 ARG SHA=394ffa7b0a7fff3ec484bcd084e673a8b301ccc8
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 && \

9
services/AUTOMATIC1111/entrypoint.sh
View file

@ -20,6 +20,8 @@ if [ ! -f /data/config/auto/styles.csv ]; then
fi fi
# copy models from original models folder # copy models from original models folder
mkdir -p /data/models/VAE-approx/ /data/models/karlo/
rsync -a --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/ rsync -a --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/
rsync -a --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/ rsync -a --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/
@ -57,9 +59,10 @@ chown -R root ~/.cache/
chmod 766 ~/.cache/ chmod 766 ~/.cache/
shopt -s nullglob shopt -s nullglob
list=(./extensions/*/requirements.txt) # For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy
for req in "${list[@]}"; do list=(./extensions/*/install.py)
pip install -r "$req" for installscript in "${list[@]}"; do
PYTHONPATH=${ROOT} python "$installscript"
done done
if [ -f "/data/config/auto/startup.sh" ]; then if [ -f "/data/config/auto/startup.sh" ]; then