From a2561f2659234c1adf69ccbcd302cb9578387729 Mon Sep 17 00:00:00 2001
From: cococig <84442548+cococig@users.noreply.github.com>
Date: Tue, 14 Nov 2023 03:35:24 +0900
Subject: [PATCH 1/6] Update automatic1111 webui base image (#601)

Update the minor version of Python in the base image for AUTOMATIC1111
web UI.

Closes issue #600
---
 services/AUTOMATIC1111/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index f380f30..b2618d0 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -20,7 +20,7 @@ RUN apk add --no-cache aria2
 RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl'
 
 
-FROM python:3.10.9-slim
+FROM python:3.10.13-slim
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 

From 3e67f559d43b53faeb4a32b63c8b89391f0b7248 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Mon, 13 Nov 2023 21:12:07 +0100
Subject: [PATCH 2/6] Update Auto (#610)

Closes #609

https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/4afaaf8a020c1df457bcf7250cb1c7f609699fa7
---
 .github/ISSUE_TEMPLATE/bug.md        |  2 +-
 .github/pull_request_template.md     |  1 -
 docker-compose.yml                   |  2 +-
 services/AUTOMATIC1111/Dockerfile    | 41 ++++------------------------
 services/AUTOMATIC1111/entrypoint.sh |  8 ++++--
 services/AUTOMATIC1111/info.py       | 14 ----------
 6 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 services/AUTOMATIC1111/info.py

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 2c2c54f..a475834 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -19,7 +19,7 @@ assignees: ""
 
 **Which UI**
 
-auto or auto-cpu or invoke or sygil?
+auto or auto-cpu or invoke or comfy?
 
 **Hardware / Software**
 
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6fd8686..38bdfd8 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,6 +9,5 @@ Closes issue #
 ### Update versions
 
 - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/
-- sygil: https://github.com/Sygil-Dev/sygil-webui/commit/
 - invoke: https://github.com/invoke-ai/InvokeAI/commit/
 - comfy: https://github.com/comfyanonymous/ComfyUI/commit/
diff --git a/docker-compose.yml b/docker-compose.yml
index 93fba1d..b5b57e8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:67
+    image: sd-auto:68
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index b2618d0..9e40d8c 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -15,12 +15,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr
 RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
 
 
-FROM alpine:3.17 as xformers
-RUN apk add --no-cache aria2
-RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl'
-
-
-FROM python:3.10.13-slim
+FROM pytorch/pytorch:2.1.0-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -32,58 +27,34 @@ RUN --mount=type=cache,target=/var/cache/apt \
   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 \
-  aria2c -x 5 --dir /cache --out torch-2.0.1-cp310-cp310-linux_x86_64.whl -c \
-  https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl && \
-  pip install /cache/torch-2.0.1-cp310-cp310-linux_x86_64.whl torchvision --index-url https://download.pytorch.org/whl/cu118
-
-
+WORKDIR /
 RUN --mount=type=cache,target=/root/.cache/pip \
   git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
   cd stable-diffusion-webui && \
-  git reset --hard 5ef669de080814067961f28357256e8fe27544f4 && \
+  git reset --hard 4afaaf8a020c1df457bcf7250cb1c7f609699fa7 && \
   pip install -r requirements_versions.txt
 
-RUN --mount=type=cache,target=/root/.cache/pip  \
-  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64.whl \
-  pip install /xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64.whl
 
 ENV ROOT=/stable-diffusion-webui
 
-
 COPY --from=download /repositories/ ${ROOT}/repositories/
 RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate
 RUN --mount=type=cache,target=/root/.cache/pip \
   pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install pyngrok \
+  pip install pyngrok xformers \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
   git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b
 
 
-# Note: don't update the sha of previous versions because the install will take forever
-# instead, update the repo state in a later step
-
-# TODO: either remove if fixed in A1111 (unlikely) or move to the top with other apt stuff
-RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
-ENV LD_PRELOAD=libtcmalloc.so
-
-ARG SHA=5ef669de080814067961f28357256e8fe27544f4
-RUN --mount=type=cache,target=/root/.cache/pip \
-  cd stable-diffusion-webui && \
-  git fetch && \
-  git reset --hard ${SHA} && \
-  pip install -r requirements_versions.txt
-
 COPY . /docker
 
 RUN \
-  python3 /docker/info.py ${ROOT}/modules/ui.py && \
-  mv ${ROOT}/style.css ${ROOT}/user.css && \
+  # mv ${ROOT}/style.css ${ROOT}/user.css && \
   # one of the ugliest hacks I ever wrote \
-  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py && \
+  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/lib/python3.10/site-packages/gradio/routes.py && \
   git config --global --add safe.directory '*'
 
 WORKDIR ${ROOT}
diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh
index 52f025f..35023af 100755
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -5,6 +5,10 @@ set -Eeuo pipefail
 # TODO: move all mkdir -p ?
 mkdir -p /data/config/auto/scripts/
 # mount scripts individually
+
+echo $ROOT
+ls -lha $ROOT
+
 find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
 cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
 
@@ -62,9 +66,9 @@ shopt -s nullglob
 # 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
-  EXTNAME=`echo $installscript | cut -d '/' -f 3`
+  EXTNAME=$(echo $installscript | cut -d '/' -f 3)
   # Skip installing dependencies if extension is disabled in config
-  if `jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json`; then
+  if $(jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json); then
     echo "Skipping disabled extension ($EXTNAME)"
     continue
   fi
diff --git a/services/AUTOMATIC1111/info.py b/services/AUTOMATIC1111/info.py
deleted file mode 100644
index edfa7b0..0000000
--- a/services/AUTOMATIC1111/info.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import sys
-from pathlib import Path
-
-file = Path(sys.argv[1])
-file.write_text(
-  file.read_text()\
-  .replace('    return demo', """
-    with demo:
-        gr.Markdown(
-          'Created by [AUTOMATIC1111 / stable-diffusion-webui-docker](https://github.com/AbdBarho/stable-diffusion-webui-docker/)'
-        )
-    return demo
-""", 1)
-)

From 90affeb72ab15a66537e171dcb24bee03f8291b4 Mon Sep 17 00:00:00 2001
From: sejoung kim <sejoung@gmail.com>
Date: Mon, 1 Jan 2024 19:04:02 +0900
Subject: [PATCH 3/6] Bump Comfy (#603)

https://github.com/comfyanonymous/ComfyUI/commit/d1f3637a5a944d0607b899babd8ff11d87100503

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
---
 docker-compose.yml        |  2 +-
 services/comfy/Dockerfile | 30 ++++--------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b5b57e8..c8e98de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
     <<: *base_service
     profiles: ["comfy"]
     build: ./services/comfy/
-    image: sd-comfy:5
+    image: sd-comfy:6
     environment:
       - CLI_ARGS=
 
diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile
index 6d1f6ce..f813c68 100644
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -1,8 +1,4 @@
-FROM alpine:3.17 as xformers
-RUN apk add --no-cache aria2
-RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl'
-
-FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-runtime
+FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -13,32 +9,14 @@ RUN --mount=type=cache,target=/root/.cache/pip \
   git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
   cd ${ROOT} && \
   git checkout master && \
-  git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \
+  git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \
   pip install -r requirements.txt
 
-
-RUN --mount=type=cache,target=/root/.cache/pip  \
-  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \
-  pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl
-
-
 WORKDIR ${ROOT}
-
-ARG BRANCH=master SHA=7e941f9f247f9b013a33c2e7d117466108414e99
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git fetch && \
-  git checkout ${BRANCH} && \
-  git reset --hard ${SHA} && \
-  pip install -r requirements.txt
-
-# add info
 COPY . /docker/
-RUN cp /docker/extra_model_paths.yaml ${ROOT}
-RUN chmod u+x /docker/entrypoint.sh
-RUN cp /docker/extra_model_paths.yaml ${ROOT}
+RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
 
-ENV NVIDIA_VISIBLE_DEVICES=all
-ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
 CMD python -u main.py --listen --port 7860 ${CLI_ARGS}

From fbc5c359d03f539d4f6eaa90fd18d8590a2a4b61 Mon Sep 17 00:00:00 2001
From: simonmcnair <101189766+simonmcnair@users.noreply.github.com>
Date: Mon, 1 Jan 2024 10:13:01 +0000
Subject: [PATCH 4/6] Resolve memory usage situation in Auto (#620)

Fixes
https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/612

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
---
 docker-compose.yml                | 2 +-
 services/AUTOMATIC1111/Dockerfile | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c8e98de..f9a475c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:68
+    image: sd-auto:69
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 9e40d8c..c30ac1f 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -48,6 +48,10 @@ RUN --mount=type=cache,target=/root/.cache/pip \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
   git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b
 
+# there seems to be a memory leak (or maybe just memory not being freed fast eno8ugh) 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
 

From f61363974802f22f6c0cfd869239b1a5b93254bb Mon Sep 17 00:00:00 2001
From: Adam Florizone <72236049+adamflorizone@users.noreply.github.com>
Date: Mon, 1 Jan 2024 05:30:40 -0500
Subject: [PATCH 5/6] Update Auto v1.7.0 (#632)

Update Auto v1.7.0


https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.7.0

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
---
 docker-compose.yml                | 2 +-
 services/AUTOMATIC1111/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f9a475c..4901b80 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:69
+    image: sd-auto:70
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index c30ac1f..3a2f5a5 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -15,7 +15,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr
 RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
 
 
-FROM pytorch/pytorch:2.1.0-cuda12.1-cudnn8-runtime
+FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -31,7 +31,7 @@ WORKDIR /
 RUN --mount=type=cache,target=/root/.cache/pip \
   git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
   cd stable-diffusion-webui && \
-  git reset --hard 4afaaf8a020c1df457bcf7250cb1c7f609699fa7 && \
+  git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \
   pip install -r requirements_versions.txt
 
 

From 60c4832185dc492166c5e3f8492f00120d15e35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sj=C3=B6lund?= <j.sjolund@gmail.com>
Date: Mon, 1 Jan 2024 11:34:46 +0100
Subject: [PATCH 6/6] Update open_clip to v2.20.0 in Auto (#617)

Fixes #615.

Updates `open-clip-torch` to the one specified in auto's
[requirements_versions.txt](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/requirements_versions.txt#L18).

---------

Co-authored-by: AbdBarho <ka70911@gmail.com>
---
 docker-compose.yml                | 2 +-
 services/AUTOMATIC1111/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4901b80..44dcc87 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:70
+    image: sd-auto:71
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 3a2f5a5..efc712c 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
   pip install pyngrok xformers \
   git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
   git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
-  git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b
+  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 eno8ugh) that is fixed by this version of malloc
 # maybe move this up to the dependencies list.