Merge 563eb47d07 into 802d0bcd68

Add Automatic1111-Forge:
https://github.com/lllyasviel/stable-diffusion-webui-forge

services/AUTOMATIC1111-forge/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine/git:latest as download
+FROM alpine/git:2.36.2 as download
 
 COPY clone.sh /clone.sh
 
@@ -16,7 +16,7 @@ RUN . /clone.sh google_blockly_prototypes https://github.com/lllyasviel/google_b
 RUN . /clone.sh stable-diffusion-webui-assets https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git 6f7db241d2f8ba7457bac5ca9753331f0c266917
 
 
-FROM pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime
+FROM pytorch/pytorch:2.3.1-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -54,11 +54,11 @@ ENV LD_PRELOAD=libtcmalloc.so
 
 COPY . /docker
 
-#RUN \
+RUN \
   # 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' /opt/conda/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 '*'
+  git config --global --add safe.directory '*'
 
 WORKDIR ${ROOT}
 ENV NVIDIA_VISIBLE_DEVICES=all

services/AUTOMATIC1111-forge/clone.sh

@@ -1,15 +1,11 @@
 #!/bin/bash
 
-set -Eeox pipefail
+set -Eeuox pipefail
 
 mkdir -p /repositories/"$1"
 cd /repositories/"$1"
 git init
 git remote add origin "$2"
-
-if [ -n "$3" ]; then
 git fetch origin "$3" --depth=1
 git reset --hard "$3"
-fi
-
 rm -rf .git

services/AUTOMATIC1111/Dockerfile

@@ -30,10 +30,9 @@ 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 v1.10.1 && \
+  git reset --hard v1.9.4 && \
   pip install -r requirements_versions.txt
 
-RUN pip install -U typing_extensions
 
 ENV ROOT=/stable-diffusion-webui
 

services/AUTOMATIC1111/clone.sh

@@ -1,15 +1,11 @@
 #!/bin/bash
 
-set -Eeox pipefail
+set -Eeuox pipefail
 
 mkdir -p /repositories/"$1"
 cd /repositories/"$1"
 git init
 git remote add origin "$2"
-
-if [ -n "$3" ]; then
 git fetch origin "$3" --depth=1
 git reset --hard "$3"
-fi
-
 rm -rf .git

services/comfy/Dockerfile

@@ -1,4 +1,4 @@
-FROM pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime
+FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -9,6 +9,7 @@ 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 276f8fce9f5a80b500947fb5745a4dde9e84622d && \
   pip install -r requirements.txt
 
 WORKDIR ${ROOT}