diff --git a/docker-compose.yml b/docker-compose.yml index 2c33cd9..4d2c834 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:59 + image: sd-auto:62 environment: - CLI_ARGS=${WEBUI_ARGS:---allow-code --medvram --xformers --enable-insecure-extension-access --api} diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 6ef8fda..55a049b 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ # we need those apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 \ # 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 \ @@ -71,7 +71,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ RUN apt-get -y install libgoogle-perftools-dev && apt-get clean ENV LD_PRELOAD=libtcmalloc.so -ARG SHA=20ae71faa8ef035c31aa3a410b707d792c8203a3 +ARG SHA=394ffa7b0a7fff3ec484bcd084e673a8b301ccc8 RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \ diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index 095c2d1..5cdaacf 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -20,6 +20,8 @@ if [ ! -f /data/config/auto/styles.csv ]; then fi # 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/karlo/ /data/models/karlo/ @@ -57,9 +59,10 @@ chown -R root ~/.cache/ chmod 766 ~/.cache/ shopt -s nullglob -list=(./extensions/*/requirements.txt) -for req in "${list[@]}"; do - pip install -r "$req" +# For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy +list=(./extensions/*/install.py) +for installscript in "${list[@]}"; do + PYTHONPATH=${ROOT} python "$installscript" done if [ -f "/data/config/auto/startup.sh" ]; then