From f76f8d467167faa8d51356750d90115b815ae2c3 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sun, 11 Sep 2022 05:25:45 +0200
Subject: [PATCH] Update Versions (#45)

* Update Automatic to 1b963c20

* Update hlky to dev branch

* Update automatic
---
 AUTOMATIC1111/Dockerfile | 24 ++++++++++++++++--------
 AUTOMATIC1111/mount.sh   |  6 ++++--
 docker-compose.yml       |  1 +
 hlky/Dockerfile          | 13 ++++++++++---
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/AUTOMATIC1111/Dockerfile b/AUTOMATIC1111/Dockerfile
index fd72982..0b4c04a 100644
--- a/AUTOMATIC1111/Dockerfile
+++ b/AUTOMATIC1111/Dockerfile
@@ -10,29 +10,37 @@ git clone https://github.com/CompVis/taming-transformers.git repositories/taming
 rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
 EOF
 
-FROM pytorch/pytorch:1.12.1-cuda11.3-cudnn8-runtime
+
+FROM continuumio/miniconda3:4.12.0
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install git fonts-dejavu-core -y && apt-get clean
+
+RUN conda install python=3.8.5 && 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 -y && apt-get clean
+
 
 RUN <<EOF
 git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
 cd stable-diffusion-webui
-git reset --hard db6db585eb9ee48e7315e28603e18531dbc87067
-pip install -U --prefer-binary --no-cache-dir -r requirements.txt
+git reset --hard 13eec4f3d4081fdc43883c5ef02e471a2b6c7212
+conda env update --file environment-wsl2.yaml -n base
+conda clean -a -y
+pip install --prefer-binary --no-cache-dir -r requirements.txt
 EOF
 
-ENV ROOT=/workspace/stable-diffusion-webui \
-  WORKDIR=/workspace/stable-diffusion-webui/repositories/stable-diffusion
+ENV ROOT=/stable-diffusion-webui \
+  WORKDIR=/stable-diffusion-webui/repositories/stable-diffusion
 
 COPY --from=download /git/ ${ROOT}
-RUN pip install --prefer-binary -U --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
+RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt
 
 # 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=17a7477c7282b0ff16fa1232e5922c0a645e4459
+ARG SHA=06fadd2dc5c2753558a9f3971568c2673819f48c
 RUN <<EOF
 cd stable-diffusion-webui
 git pull
diff --git a/AUTOMATIC1111/mount.sh b/AUTOMATIC1111/mount.sh
index 9248d9a..aabfd63 100755
--- a/AUTOMATIC1111/mount.sh
+++ b/AUTOMATIC1111/mount.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 declare -A MODELS
 
 MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
@@ -17,8 +19,8 @@ for path in "${!MODELS[@]}"; do
 done
 
 # force realesrgan cache
-rm -rf /opt/conda/lib/python3.7/site-packages/realesrgan/weights
-ln -s -T /models /opt/conda/lib/python3.7/site-packages/realesrgan/weights
+rm -rf /opt/conda/lib/python3.8/site-packages/realesrgan/weights
+ln -s -T /models /opt/conda/lib/python3.8/site-packages/realesrgan/weights
 
 # force facexlib cache
 mkdir -p /cache/weights/ ${WORKDIR}/gfpgan/
diff --git a/docker-compose.yml b/docker-compose.yml
index cf9a3b4..32b9ec3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       args:
         # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main
         # USE AT YOUR OWN RISK! otherwise just leave it empty.
+        BRANCH:
         WEBUI_SHA:
     ports:
       - "7860:7860"
diff --git a/hlky/Dockerfile b/hlky/Dockerfile
index 143f9d4..b06e788 100644
--- a/hlky/Dockerfile
+++ b/hlky/Dockerfile
@@ -23,9 +23,16 @@ RUN pip install -U --no-cache-dir pyperclip
 
 # 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 WEBUI_SHA=b9d97c9816251933d094f1dae43d2c631a07db7a
-RUN cd stable-diffusion && git pull && git reset --hard ${WEBUI_SHA} && \
-  conda env update --file environment.yaml --name base && conda clean -a -y
+ARG BRANCH=dev
+ARG WEBUI_SHA=be2ece06837e37d90181a17340c7e1aac91ba4fb
+RUN <<EOF
+cd stable-diffusion
+git fetch
+git checkout ${BRANCH}
+git reset --hard ${WEBUI_SHA}
+conda env update --file environment.yaml -n base
+conda clean -a -y
+EOF
 
 # Textual inversion
 RUN <<EOF