Update / Disable lstein Temporarily (#106)

- auto:
f80c3696f6
- model merger now works! the resulting model is saved in
`cache/custom-models`
- hlky:
aaa3be16e0
- lstein:
8c9f2ae705
- This UI has been temporarely disabled due to limitation in the output
path:
8c9f2ae705/backend/modules/create_cmd_parser.py (L26)

services/AUTOMATIC1111/Dockerfile

@@ -17,6 +17,8 @@ git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
 rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
+RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard 9e3002b7cd64df7870e08527b7664eb2f2f5f3f5
+
 
 FROM continuumio/miniconda3:4.12.0
 
@@ -34,7 +36,7 @@ RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
 git reset --hard 15f333a266c20319e2b95a47a8834adf7b914aec
-pip install --prefer-binary --no-cache-dir -r requirements.txt
+pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
 EOF
 
 ENV ROOT=/stable-diffusion-webui \
@@ -47,13 +49,13 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
 # 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=15f333a266c20319e2b95a47a8834adf7b914aec
+ARG SHA=f80c3696f63a181f720105559d42ee53453ed0eb
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase
 git reset --hard ${SHA}
-pip install --prefer-binary --no-cache-dir -r requirements.txt
 pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
+pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
 RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless