From 5af482ed8c975df6aa0210225ad68b218d4f61da Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Sat, 3 Sep 2022 13:15:25 +0200
Subject: [PATCH] Update Core to c84748a (#25)

---
 build/Dockerfile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index bd6d9b113..58dc337ef 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -7,9 +7,6 @@ RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorc
 RUN git clone https://github.com/hlky/stable-diffusion.git && cd stable-diffusion && git reset --hard ff8c2d0b709f1e4180fb19fa5c27ec28c414cedd
 RUN conda env update --file stable-diffusion/environment.yaml --name base && conda clean -a -y
 
-# Fix: Module PIL has not attribute "Resampling"
-RUN conda install -c anaconda pillow==9.2.0 && conda clean -a -y
-
 
 SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
@@ -18,8 +15,9 @@ RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
 
 # Note: don't update the sha of previous versions because the install will take forever
 # instead, update the repo state in a later step
-RUN cd stable-diffusion && git pull && git reset --hard d667ff52a36b4e79526f01555bfbf85428f334ce && \
-  conda env update --file environment.yaml --name base && conda clean -a -y
+RUN cd stable-diffusion && git pull && git reset --hard c84748aa6802c2f934687883a79bde745d2a58a6 && \
+  conda env update --file environment.yaml --name base && conda clean -a -y \
+  && pip install -U --no-cache-dir pyperclip
 
 # download dev UI version, update the sha below in case you want some other version
 # RUN <<EOF
@@ -45,7 +43,7 @@ EOF
 RUN <<EOF
 git clone https://github.com/devilismyfriend/latent-diffusion &&
 cd /latent-diffusion &&
-git reset --hard 4119cf038fb953360fb004e48adb9913eed3594a &&
+git reset --hard 6d61fc03f15273a457950f2cdc10dddf53ba6809 &&
 # hacks all the way down
 mv ldm ldm_latent &&
 sed -i -- 's/from ldm/from ldm_latent/g' *.py
@@ -61,4 +59,4 @@ WORKDIR /stable-diffusion
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 EXPOSE 7860
 # run, -u to not buffer stdout / stderr
-CMD /docker/mount.sh && python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --ldsr-dir /latent-diffusion --save-metadata ${CLI_ARGS}
+CMD /docker/mount.sh && python3 -u scripts/webui.py --outdir /output --ckpt /models/model.ckpt --ldsr-dir /latent-diffusion ${CLI_ARGS}