Merge remote-tracking branch 'refs/remotes/upstream/master' into merge

# Conflicts:
#	docker-compose.yml
#	services/AUTOMATIC1111/Dockerfile
#	services/comfy/Dockerfile
#	services/comfy/entrypoint.sh
This commit is contained in:
fapoverflow 2025-08-02 03:56:32 +02:00
commit f7f2d900d9
20 changed files with 984 additions and 17 deletions

View file

@ -26,12 +26,13 @@ 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/
rsync --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/
rsync --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/
declare -A MOUNTS
MOUNTS["/root/.cache"]="/data/.cache"
#MOUNTS["/root/.cache"]="/data/.cache"
MOUNTS["${USER_HOME}/.cache"]="/data/.cache"
MOUNTS["${ROOT}/models"]="/data/models"
MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
@ -59,10 +60,12 @@ done
echo "Installing extension dependencies (if any)"
# because we build our container as root:
chown -R root ~/.cache/
chown -R $PUID:$PGID ~/.cache/
chmod 766 ~/.cache/
chown -R $PUID:$PGID /output
chmod 766 /output
shopt -s nullglob
# For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy
list=(./extensions/*/install.py)