Update versions (#82)

### Update versions

- auto: dd911a47b3
- hlky: 17748cbc9c
- lstein: 50d607ffea

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+### Update versions
+
+- auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/
+- hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/
+- lstein: https://github.com/lstein/stable-diffusion/commit/

docker-compose.yml

@@ -39,7 +39,7 @@ services:
       - *v2
       - ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
     environment:
-      - CLI_ARGS=--medvram --opt-split-attention
+      - CLI_ARGS=--medvram
 
   automatic1111-cpu:
     <<: *automatic

services/AUTOMATIC1111/Dockerfile

@@ -44,7 +44,7 @@ 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=9e892d90ceaa6493d8b9092c89017485bb658c5b
+ARG SHA=dd911a47b3c3313b3938b700eb26cbd5bb3e1c95
 RUN <<EOF
 cd stable-diffusion-webui
 git pull --rebase

services/hlky/Dockerfile

@@ -23,10 +23,10 @@ EOF
 
 # 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 BRANCH=master
+ARG BRANCH=master
 # ARG SHA=833a91047df999302f699637768741cecee9c37b
-ARG BRANCH=dev
-ARG SHA=abb0c1c37756f0b5c3869a4037fd3402671c025a
+# ARG BRANCH=dev
+ARG SHA=17748cbc9c34df44d0381c42e4f0fe1903089438
 RUN <<EOF
 cd stable-diffusion
 git fetch
@@ -40,9 +40,8 @@ RUN pip uninstall transformers -y && pip install -U --no-cache-dir pyperclip tra
 
 # Latent diffusion
 RUN <<EOF
-git clone https://github.com/Hafiidz/latent-diffusion.git
+git clone --depth 1 https://github.com/Hafiidz/latent-diffusion.git
 cd latent-diffusion
-git reset --hard e1a84a89fcbb49881546cf2acf1e7e250923dba0
 # hacks all the way down
 mv ldm ldm_latent &&
 sed -i -- 's/from ldm/from ldm_latent/g' *.py

services/lstein/Dockerfile

@@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 ENV DEBIAN_FRONTEND=noninteractive
 
 # now it requires python3.9
-# RUN conda install python=3.8.5 && conda clean -a -y
+RUN conda install python=3.9 && conda clean -a -y
 RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
 
 RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
@@ -16,17 +16,19 @@ RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clea
 RUN <<EOF
 git clone https://github.com/lstein/stable-diffusion.git
 cd stable-diffusion
-# git reset --hard 751283a2de81bee4bb571fbabe4adb19f1d85b97
-# conda env update --file environment.yaml -n base
-# conda clean -a -y
+git reset --hard e994073b5bdfa3c77313681c5944be1544eb65b6
+sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
+conda env update --file environment.yaml -n base
+conda clean -a -y
 EOF
 
 
-ARG BRANCH=development SHA=9bcb0dff968bd7732ca7fa61b7cb3f6e1c8a7943
+ARG BRANCH=development SHA=50d607ffea3734072a80e38b09ba0c3758af5d40
 # ARG BRANCH=main SHA=89da371f4841f7e05da5a1672459d700c3920784
 RUN <<EOF
 cd stable-diffusion
 git fetch
+git reset --hard
 git checkout ${BRANCH}
 git reset --hard ${SHA}
 conda env update --file environment.yaml -n base
@@ -36,10 +38,17 @@ EOF
 RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.22
 
 COPY . /docker/
-RUN python3 /docker/info.py /stable-diffusion/static/dream_web/index.html && chmod +x /docker/mount.sh
+RUN <<EOF
+python3 /docker/info.py /stable-diffusion/static/dream_web/index.html
+chmod +x /docker/mount.sh
+sed -i -- 's/outputs\//\/output/g' /stable-diffusion/backend/server.py
+EOF
+
 
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch PRELOAD=false CLI_ARGS=""
 WORKDIR /stable-diffusion
 EXPOSE 7860
 
-CMD /docker/mount.sh && python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+CMD /docker/mount.sh && \
+  python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
+  #python3 -u backend/server.py