Squashed commit of the following:

commit 3c860d6
Author: AbdBarho <ka70911@gmail.com>
Date:   Thu Feb 2 19:53:48 2023 +0100

    Update versions (AbdBarho#320)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@226d840
    - invoke:
    invoke-ai/InvokeAI@80c5322

    Remove `accelerate` for startup. Refs AbdBarho#317

    Use `SIGINT` Fixes AbdBarho#319

commit 15e9841
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Jan 29 20:07:41 2023 +0100

    Update versions (AbdBarho#316)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@00dab8f
    - invoke:
    invoke-ai/InvokeAI@07e03b3

commit eeb410f
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Jan 27 07:55:22 2023 +0100

    Update versions (AbdBarho#315)

    auto:
    AUTOMATIC1111/stable-diffusion-webui@7a14c8a
    invoke:
    invoke-ai/InvokeAI@e4cd662

    Also, fix script mounting in auto AbdBarho#295

commit 9d2a338
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Jan 25 18:17:10 2023 +0100

    Always serve static files (AbdBarho#314)

commit 95e489a
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Jan 25 17:38:25 2023 +0100

    Revert AbdBarho#309 (AbdBarho#313)

    Closes AbdBarho#312

commit 00518a0
Author: AbdBarho <ka70911@gmail.com>
Date:   Tue Jan 24 23:25:07 2023 +0100

    Add missing mkdir (AbdBarho#310)

commit f8de919
Author: AbdBarho <ka70911@gmail.com>
Date:   Tue Jan 24 23:11:15 2023 +0100

    Sync Scripts (AbdBarho#309)

    Refs AbdBarho#308

commit 8713163
Author: AbdBarho <ka70911@gmail.com>
Date:   Tue Jan 24 19:52:15 2023 +0100

    Update Auto (AbdBarho#307)

    AUTOMATIC1111/stable-diffusion-webui@93fad28

commit e2b0fb9
Author: AbdBarho <ka70911@gmail.com>
Date:   Tue Jan 24 19:17:34 2023 +0100

    Add Lora support (AbdBarho#306)

    Refs AbdBarho#305 AbdBarho#303

    Co-authored-by: repligator <114337591+repligator@users.noreply.github.com>

commit 510f9fa
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Jan 22 20:32:03 2023 +0100

    Update versions (AbdBarho#302)

    Closes AbdBarho#301

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@c98cb0f
    - invoke:
    invoke-ai/InvokeAI@89791d9

commit 042d5c5
Author: AbdBarho <ka70911@gmail.com>
Date:   Thu Jan 19 06:37:53 2023 +0100

    Fix link / mkdir order (AbdBarho#299)

    Fixes
    AbdBarho@c9153fa#commitcomment-97285124

commit 6684637
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Jan 18 18:50:56 2023 +0100

    Mount scripts instead of copy (AbdBarho#298)

    Refs AbdBarho#295

commit c9153fa
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Jan 18 18:48:34 2023 +0100

    Update versions (AbdBarho#297)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@6faae23
    - invoke:
    invoke-ai/InvokeAI@f232068

commit 13dfd4e
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Jan 15 11:50:16 2023 +0100

    Update auto (AbdBarho#293)

    AUTOMATIC1111/stable-diffusion-webui@d97f467

    This version has a hash computation of models, so expect slower start up
    & loading times.

commit 9b1ea3c
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Jan 13 21:27:55 2023 +0100

    [MAJOR] Update auto to torch 1.13.1 (AbdBarho#290)

    AUTOMATIC1111/stable-diffusion-webui@82725f0

    torch==1.13.1+cu117

    This might break your extensions!

commit b5cdf29
Author: AbdBarho <ka70911@gmail.com>
Date:   Mon Jan 9 19:04:40 2023 +0100

    Update versions (AbdBarho#287)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@2b94ec7
    - sygil:
    Sygil-Dev/sygil-webui@571fb89

commit db831ec
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Jan 7 18:58:50 2023 +0100

    Bump versions (AbdBarho#286)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@1512333
    - invoke:
    invoke-ai/InvokeAI@26e413a

commit ceeac61
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Jan 6 10:24:20 2023 +0100

    Update auto (AbdBarho#282)

    AUTOMATIC1111/stable-diffusion-webui@683287d

commit 19972f3
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Jan 4 20:36:49 2023 +0100

    Update Versions (AbdBarho#281)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@8149078
    - sygil:
    Sygil-Dev/sygil-webui@e484828
    - invoke:
    invoke-ai/InvokeAI@21bf512

commit 0c16c10
Author: AbdBarho <ka70911@gmail.com>
Date:   Tue Jan 3 21:19:37 2023 +0100

    Update auto (AbdBarho#280)

    AUTOMATIC1111/stable-diffusion-webui@3e22e29

commit 78c90e5
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Jan 1 16:46:41 2023 +0100

    Update auto & invoke (AbdBarho#277)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@524d532
    - invoke:
    invoke-ai/InvokeAI@524d532

    Happy new Year!!!

commit 6a3826c
Author: AbdBarho <ka70911@gmail.com>
Date:   Mon Dec 26 09:50:29 2022 +0100

    Update auto (AbdBarho#274)

    AUTOMATIC1111/stable-diffusion-webui@4af3ca5

    Merry Christmas 🎄

commit 56d9763
Author: AbdBarho <ka70911@gmail.com>
Date:   Thu Dec 22 09:19:39 2022 +0100

    Smaller xformers wheel (AbdBarho#271)

    Built with `Release` instead of `RelWithDebInfo`

    Related AbdBarho#270

commit 41e0dcc
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Dec 17 12:22:45 2022 +0100

    Auto: clean up interrogators (AbdBarho#265)

commit 5a9d305
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Dec 16 09:57:33 2022 +0100

    Update Invoke (AbdBarho#264)

    invoke-ai/InvokeAI@ffa54f4

commit d70e96d
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Dec 14 09:47:36 2022 +0100

    Update Invoke (AbdBarho#261)

    invoke-ai/InvokeAI@5d20f47

commit d97d257
Author: AbdBarho <ka70911@gmail.com>
Date:   Mon Dec 12 09:25:44 2022 +0100

    Update versions (AbdBarho#257)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@685f963
    - sygil:
    Sygil-Dev/sygil-webui@d3f9d05
    - invoke:
    invoke-ai/InvokeAI@e159bb3

commit c3cf812
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Dec 10 12:06:37 2022 +0100

    Expose API per default

commit b8256cc
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Dec 10 11:42:04 2022 +0100

    Update PR template

commit 4969906
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Dec 10 11:40:25 2022 +0100

    Update Download URLs

commit 8201e36
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Dec 9 18:14:48 2022 +0100

    Alpha support  for sd v2.x in auto (AbdBarho#244)

    AUTOMATIC1111/stable-diffusion-webui@44c46f0

    Install sd 2 from [these
    instructions](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#stable-diffusion-20),
    put the downloaded files in `data/StableDiffusion/`, maybe create a
    subfolder `v2` and put the models in it, just to keep everything clean.

    There will be problems, so be warry.

commit 1423b27
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Dec 9 16:50:46 2022 +0100

    Update Versions (AbdBarho#256)

    sygil:
    Sygil-Dev/sygil-webui@5291437
    Also, switch to pip instead of conda because it is really slow

    invoke:
    invoke-ai/InvokeAI@ed9186b

commit 87a51e9
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Dec 4 11:00:28 2022 +0100

    [BREAKING] Rename UIs (AbdBarho#254)

    Rename the UIs in docker compose to their new names

    Changes folder names

    Changes output folder structure

    Closes issue AbdBarho#263

    Adds `sygil-sl` instead of docker compose flag.

commit bdee804
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Dec 4 07:07:49 2022 +0100

    Fix mounting in Lstein (AbdBarho#253)

    Closes AbdBarho#251

commit f1a1641
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Dec 3 13:36:18 2022 +0100

    Invoke 2.2.3 (AbdBarho#250)

    lstein:
    invoke-ai/InvokeAI@5c31feb

commit 8df9d10
Author: AbdBarho <ka70911@gmail.com>
Date:   Wed Nov 30 19:33:44 2022 +0100

    Update versions (AbdBarho#246)

    - hlky:
    Sygil-Dev/sygil-webui@18a3b80
    - lstein:
    invoke-ai/InvokeAI@a9aa4e4

commit 7a1e52b
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Nov 26 15:45:53 2022 +0100

    Enable extensions by default (AbdBarho#243)

    Closes AbdBarho#242

commit d20b873
Author: AbdBarho <ka70911@gmail.com>
Date:   Fri Nov 25 13:25:10 2022 +0100

    Update xformers (AbdBarho#241)

    facebookresearch/xformers@8910bb5

commit 23757d2
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Nov 20 11:35:56 2022 +0100

    Update invoke (AbdBarho#234)

    invoke-ai/InvokeAI@2b7e3ab

commit 9e7979b
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Nov 20 11:05:39 2022 +0100

    Update Versions (AbdBarho#230)

    - auto:
    AUTOMATIC1111/stable-diffusion-webui@47a44c7
    - hlky:
    Sygil-Dev/sygil-webui@269107a

    Refs AbdBarho#216

commit 8623c73
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Nov 13 08:42:27 2022 +0100

    v1.5 Inpainting (AbdBarho#221)

    Also remove v1.4

    Closes AbdBarho#217

commit 9b6750b
Author: AbdBarho <ka70911@gmail.com>
Date:   Sun Nov 13 07:12:17 2022 +0100

    Use cuda 11.6 for auto (AbdBarho#220)

    auto:
    AUTOMATIC1111/stable-diffusion-webui@98947d1

    Closes AbdBarho#218 AbdBarho#219

commit 5e3f20b
Author: AbdBarho <ka70911@gmail.com>
Date:   Sat Nov 12 18:33:59 2022 +0100

    Move contribution to the top

data/.gitignore

@@ -19,3 +19,4 @@
 /Hypernetworks
 /VAE
 /embeddings
+/Lora

docker-compose.yml

@@ -6,6 +6,7 @@ x-base_service: &base_service
     volumes:
       - &v1 ./data:/data
       - &v2 ./output:/output
+    stop_signal: SIGINT
     deploy:
       resources:
         reservations:
@@ -27,7 +28,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:32
+    image: sd-auto:42
     environment:
       - CLI_ARGS=--allow-code --medvram --deepdanbooru --gradio-auth torun225:torun225 --xformers --enable-insecure-extension-access --api
 
@@ -42,7 +43,7 @@ services:
     <<: *base_service
     profiles: ["invoke"]
     build: ./services/invoke/
-    image: sd-invoke:17
+    image: sd-invoke:22
     environment:
       - PRELOAD=true
       - CLI_ARGS=

services/AUTOMATIC1111/Dockerfile

@@ -60,16 +60,15 @@ 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 opencv-python-headless \
+  pip install pyngrok \
   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 \
-  pyngrok
+  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
 
-ARG SHA=19de2a626b92bcfe83a97477f20d0faf9b3204c0
+ARG SHA=226d840e84c5f306350b0681945989b86760e616
 RUN --mount=type=cache,target=/root/.cache/pip <<EOF
 cd stable-diffusion-webui
 git fetch
@@ -78,14 +77,15 @@ sed -i '$a clip' requirements.txt
 pip install -r requirements_versions.txt
 EOF
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install -U opencv-python-headless transformers>=4.24
+RUN --mount=type=cache,target=/root/.cache/pip  pip install -U opencv-python-headless
 
 COPY . /docker
 
 RUN <<EOF
 python3 /docker/info.py ${ROOT}/modules/ui.py
 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
 EOF
 
 RUN pip install certipie
@@ -94,4 +94,4 @@ WORKDIR ${ROOT}
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python3 -u webui.py --listen --port 7860 ${CLI_ARGS}
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}

services/AUTOMATIC1111/entrypoint.sh

@@ -2,13 +2,19 @@
 
 set -Eeuo pipefail
 
+# TODO: move all mkdir -p ?
+mkdir -p /data/config/auto/scripts/
+# mount scripts individually
+find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
+cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
+
+cp -n /docker/config.json /data/config/auto/config.json
+jq '. * input' /data/config/auto/config.json /docker/config.json | sponge /data/config/auto/config.json
+
 if [ ! -f /data/config/auto/ui-config.json ]; then
   echo '{}' >/data/config/auto/ui-config.json
 fi
 
-# copy scripts, we cannot just mount the directory because it will override the already provided scripts in the repo
-cp -rfT /data/config/auto/scripts/ "${ROOT}/scripts"
-
 declare -A MOUNTS
 
 MOUNTS["/root/.cache"]="/data/.cache"
@@ -28,6 +34,7 @@ MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
 MOUNTS["${ROOT}/models/torch_deepdanbooru"]="/data/Deepdanbooru"
 MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP"
 MOUNTS["${ROOT}/models/midas"]="/data/MiDaS"
+MOUNTS["${ROOT}/models/Lora"]="/data/Lora"
 
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
 MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"

services/download/download.sh

@@ -3,7 +3,7 @@
 set -Eeuo pipefail
 
 # TODO: maybe just use the .gitignore file to create all of these
-mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS
+mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora
 
 echo "Downloading, this might take a while..."
 
@@ -15,10 +15,11 @@ parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c"
 
 cat <<EOF
 By using this software, you agree to the following licenses:
-https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
 https://github.com/AbdBarho/stable-diffusion-webui-docker/blob/master/LICENSE
-https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
+https://github.com/CompVis/stable-diffusion/blob/main/LICENSE
+https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/LICENSE.txt
 https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE
+https://github.com/sd-webui/stable-diffusion-webui/blob/master/LICENSE
 https://github.com/cszn/BSRGAN/blob/main/LICENSE
 https://github.com/sczhou/CodeFormer/blob/master/LICENSE
 https://github.com/TencentARC/GFPGAN/blob/master/LICENSE