Update versions (#121)
- auto:050a6a798c
- Now uses python 3.10 - requires a complete re-install - Image is now smaller (5.7GB vs 9.8GB) - hlky:fe6e72fde7
- lstein:31869885d9
- img2img now works
This commit is contained in:
parent
710280c7ab
commit
5698c49653
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
@ -2,4 +2,4 @@
|
||||
|
||||
- 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/
|
||||
- lstein: https://github.com/invoke-ai/InvokeAI/commit/
|
||||
|
@ -20,23 +20,22 @@ EOF
|
||||
RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878
|
||||
|
||||
|
||||
FROM continuumio/miniconda3:4.12.0
|
||||
FROM python:3.10-slim
|
||||
|
||||
SHELL ["/bin/bash", "-ceuxo", "pipefail"]
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1
|
||||
|
||||
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 pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113
|
||||
|
||||
RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
|
||||
RUN apt-get update && apt install fonts-dejavu-core rsync git -y && apt-get clean
|
||||
|
||||
|
||||
RUN <<EOF
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
|
||||
cd stable-diffusion-webui
|
||||
git reset --hard 1eb588cbf19924333b88beaa1ac0041904966640
|
||||
pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
|
||||
pip install -r requirements_versions.txt
|
||||
EOF
|
||||
|
||||
ENV ROOT=/stable-diffusion-webui \
|
||||
@ -49,7 +48,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=2995107fa24cfd72b0a991e18271dcde148c2807
|
||||
ARG SHA=050a6a798cec90ae2f881c2ddd3f0221e69907dc
|
||||
RUN <<EOF
|
||||
cd stable-diffusion-webui
|
||||
git pull --rebase
|
||||
@ -61,6 +60,7 @@ EOF
|
||||
RUN pip install --prefer-binary --no-cache-dir opencv-python-headless \
|
||||
git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
|
||||
git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1
|
||||
#xformers
|
||||
|
||||
|
||||
|
||||
|
@ -22,10 +22,7 @@ conda clean -a -y
|
||||
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 SHA=1a9c053cb7b6832695771db2555c0adc9b41e95f
|
||||
# ARG BRANCH=dev SHA=1e7bdfe3f38a6dd37fc230f440ea1b0db0937240
|
||||
ARG BRANCH=dev SHA=fe6e72fde79214aa848d47afe74487d9855b8643
|
||||
RUN <<EOF
|
||||
cd stable-diffusion
|
||||
git fetch
|
||||
@ -35,8 +32,6 @@ conda env update --file environment.yaml -n base
|
||||
conda clean -a -y
|
||||
EOF
|
||||
|
||||
RUN pip install -U --no-cache-dir pyperclip
|
||||
|
||||
# add info
|
||||
COPY . /docker/
|
||||
RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /docker/mount.sh
|
||||
@ -44,7 +39,7 @@ RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && chmod +x /d
|
||||
WORKDIR /stable-diffusion
|
||||
ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
|
||||
EXPOSE 7860
|
||||
# run, -u to not buffer stdout / stderr
|
||||
|
||||
CMD /docker/mount.sh && \
|
||||
python3 -u scripts/webui.py --outdir /output --ckpt /data/StableDiffusion/model.ckpt ${CLI_ARGS}
|
||||
# sed -i -- 's/8501/7860/g' .streamlit/config.toml && STREAMLIT_SERVER_HEADLESS=true python -u -m streamlit run scripts/webui_streamlit.py --theme.base dark
|
||||
|
@ -25,7 +25,7 @@ conda clean -a -y
|
||||
EOF
|
||||
|
||||
|
||||
ARG BRANCH=development SHA=4f247a3672474bd9c46060bab6087dbf9e2531f3
|
||||
ARG BRANCH=development SHA=31869885d9d3ee1e62c1109fb141e828e9a0e833
|
||||
RUN <<EOF
|
||||
cd stable-diffusion
|
||||
git fetch
|
||||
@ -50,8 +50,4 @@ WORKDIR /stable-diffusion
|
||||
EXPOSE 7860
|
||||
|
||||
CMD /docker/mount.sh && \
|
||||
# python3 -u backend/server.py --host 0.0.0.0 --port 7860 --cors http://localhost:7860
|
||||
python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
|
||||
# echo The lstein webUI is currently deactivated due to implementation limitations: \
|
||||
# https://github.com/invoke-ai/InvokeAI/blob/8c9f2ae705cf723d4a8a73c416e8d8bf2d746977/backend/modules/create_cmd_parser.py#L26 \
|
||||
# Once the path the output is fixed, the UI will be activated again
|
||||
|
Loading…
Reference in New Issue
Block a user