mirror of
https://github.com/AbdBarho/stable-diffusion-webui-docker.git
synced 2026-04-06 15:04:26 +00:00
Merge + update
Merges the new changes from the master with some modifications to make Comfy follow the OCI compliance
This commit is contained in:
parent
9cfb7e8df4
commit
4d05480e64
11 changed files with 117 additions and 147 deletions
|
|
@ -1,14 +1,6 @@
|
|||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM alpine/git:2.36.2 as download
|
||||
|
||||
SHELL ["/bin/sh", "-ceuxo", "pipefail"]
|
||||
|
||||
RUN <<EOF
|
||||
cat <<'EOE' > /clone.sh
|
||||
mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git
|
||||
EOE
|
||||
EOF
|
||||
COPY clone.sh /clone.sh
|
||||
|
||||
RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \
|
||||
&& rm -rf data assets **/*.ipynb
|
||||
|
|
@ -30,21 +22,19 @@ RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diff
|
|||
|
||||
FROM python:3.10.9-slim
|
||||
|
||||
SHELL ["/bin/bash", "-ceuxo", "pipefail"]
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
|
||||
|
||||
RUN PIP_NO_CACHE_DIR=1 pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
|
||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
|
||||
|
||||
RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
|
||||
|
||||
|
||||
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
|
||||
cd stable-diffusion-webui
|
||||
git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679
|
||||
pip install -r requirements_versions.txt
|
||||
EOF
|
||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
|
||||
cd stable-diffusion-webui && \
|
||||
git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679 && \
|
||||
pip install -r requirements_versions.txt
|
||||
|
||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
--mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
|
||||
|
|
@ -53,7 +43,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
|
|||
ENV ROOT=/stable-diffusion-webui
|
||||
|
||||
|
||||
COPY --from=download /git/ ${ROOT}
|
||||
COPY --from=download /repositories/ ${ROOT}/repositories/
|
||||
RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
|
||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
|
||||
|
|
@ -72,25 +62,25 @@ RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
|
|||
ENV LD_PRELOAD=libtcmalloc.so
|
||||
|
||||
ARG SHA=a9fed7c364061ae6efb37f797b6b522cb3cf7aa2
|
||||
RUN --mount=type=cache,target=/root/.cache/pip <<EOF
|
||||
cd stable-diffusion-webui
|
||||
git fetch
|
||||
git reset --hard ${SHA}
|
||||
pip install -r requirements_versions.txt
|
||||
EOF
|
||||
RUN --mount=type=cache,target=/root/.cache/pip \
|
||||
cd stable-diffusion-webui && \
|
||||
git fetch && \
|
||||
git reset --hard ${SHA} && \
|
||||
pip install -r requirements_versions.txt
|
||||
|
||||
RUN --mount=type=cache,target=/root/.cache/pip pip install -U opencv-python-headless
|
||||
|
||||
COPY . /docker
|
||||
|
||||
RUN <<EOF
|
||||
python3 /docker/info.py ${ROOT}/modules/ui.py
|
||||
mv ${ROOT}/style.css ${ROOT}/user.css
|
||||
# one of the ugliest hacks I ever wrote
|
||||
sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py
|
||||
EOF
|
||||
RUN \
|
||||
python3 /docker/info.py ${ROOT}/modules/ui.py && \
|
||||
mv ${ROOT}/style.css ${ROOT}/user.css && \
|
||||
# one of the ugliest hacks I ever wrote \
|
||||
sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py
|
||||
|
||||
WORKDIR ${ROOT}
|
||||
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
|
||||
ENV NVIDIA_VISIBLE_DEVICES=all
|
||||
ENV CLI_ARGS=""
|
||||
EXPOSE 7860
|
||||
ENTRYPOINT ["/docker/entrypoint.sh"]
|
||||
|
|
|
|||
11
services/AUTOMATIC1111/clone.sh
Normal file
11
services/AUTOMATIC1111/clone.sh
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -Eeuox pipefail
|
||||
|
||||
mkdir -p /repositories/"$1"
|
||||
cd /repositories/"$1"
|
||||
git init
|
||||
git remote add origin "$2"
|
||||
git fetch origin "$3" --depth=1
|
||||
git reset --hard "$3"
|
||||
rm -rf .git
|
||||
|
|
@ -35,6 +35,8 @@ MOUNTS["${ROOT}/models/torch_deepdanbooru"]="/data/Deepdanbooru"
|
|||
MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP"
|
||||
MOUNTS["${ROOT}/models/midas"]="/data/MiDaS"
|
||||
MOUNTS["${ROOT}/models/Lora"]="/data/Lora"
|
||||
MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet"
|
||||
MOUNTS["${ROOT}/models/openpose"]="/data/openpose"
|
||||
|
||||
MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
|
||||
MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue