Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update versions #246

Merged
merged 1 commit into from
Nov 30, 2022
Merged

Update versions #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
<<: *base_service
profiles: ["hlky"]
build: ./services/hlky/
image: sd-hlky:9
image: sd-hlky:10
environment:
- CLI_ARGS=--optimized-turbo
- USE_STREAMLIT=0
Expand All @@ -51,7 +51,7 @@ services:
<<: *base_service
profiles: ["lstein"]
build: ./services/lstein/
image: sd-lstein:7
image: sd-lstein:8
environment:
- PRELOAD=true
- CLI_ARGS=--max_loaded_models=1
2 changes: 1 addition & 1 deletion services/hlky/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ EOF

RUN apt-get update && apt install libsndfile1 ffmpeg -y && apt-get clean

ARG BRANCH=dev SHA=269107a104fc9fee3201eb2c56cf7adb3d063e4b
ARG BRANCH=dev SHA=18a3b809275c395b9a2730c78d6bc0f9b06671e1
RUN <<EOF
cd stable-diffusion
git fetch
Expand Down
7 changes: 4 additions & 3 deletions services/lstein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pip install -r requirements.txt
EOF


ARG BRANCH=development SHA=2b7e3abe57963d199f1d825ddef87ae154c81045
ARG BRANCH=development SHA=a9aa4e45aa6f5d5a2aa385349131d8733dd380fa
RUN <<EOF
git fetch
git reset --hard
Expand All @@ -32,11 +32,12 @@ git reset --hard ${SHA}
pip install -r requirements.txt
EOF

RUN pip uninstall opencv-python -y && pip install --force-reinstall opencv-python-headless==4.5.5.64
RUN pip install --force-reinstall opencv-python-headless==4.5.5.64

COPY . /docker/
RUN <<EOF
python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
touch ~/.invokeai
EOF


Expand All @@ -45,4 +46,4 @@ EXPOSE 7860


ENTRYPOINT ["/docker/entrypoint.sh"]
CMD python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir . --outdir /output ${CLI_ARGS}
5 changes: 2 additions & 3 deletions services/lstein/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers
MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers
MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers

MOUNTS["${ROOT}/configs/models.yaml"]=/docker/models.yaml

# hacks
MOUNTS["/opt/conda/lib/python3.10/site-packages/facexlib/weights"]=/data/.cache/
MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/

# MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN

for to_path in "${!MOUNTS[@]}"; do
set -Eeuo pipefail
Expand All @@ -41,7 +40,7 @@ for to_path in "${!MOUNTS[@]}"; do
done

if "${PRELOAD}" == "true"; then
python3 -u scripts/preload_models.py --no-interactive
python3 -u scripts/preload_models.py --no-interactive --root . --config_file /docker/models.yaml
fi

exec "$@"