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

@ -21,9 +21,11 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
RUN --mount=type=cache,target=/var/cache/apt \
apt-get update && \
# 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
ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential libgoogle-perftools-dev && \
apt-get clean
WORKDIR /
RUN --mount=type=cache,target=/root/.cache/pip \
@ -44,8 +46,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
git+https://github.com/mlfoundations/open_clip.git@v2.20.0
# there seems to be a memory leak (or maybe just memory not being freed fast enough) that is fixed by this version of malloc
# maybe move this up to the dependencies list.
RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
ENV LD_PRELOAD=libtcmalloc.so
COPY . /docker