Skip to content

Commit 8df9d10

Browse files
authored
1 parent 7a1e52b commit 8df9d10

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ services:
4242
<<: *base_service
4343
profiles: ["hlky"]
4444
build: ./services/hlky/
45-
image: sd-hlky:9
45+
image: sd-hlky:10
4646
environment:
4747
- CLI_ARGS=--optimized-turbo
4848
- USE_STREAMLIT=0
@@ -51,7 +51,7 @@ services:
5151
<<: *base_service
5252
profiles: ["lstein"]
5353
build: ./services/lstein/
54-
image: sd-lstein:7
54+
image: sd-lstein:8
5555
environment:
5656
- PRELOAD=true
5757
- CLI_ARGS=--max_loaded_models=1

services/hlky/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ EOF
2525

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

28-
ARG BRANCH=dev SHA=269107a104fc9fee3201eb2c56cf7adb3d063e4b
28+
ARG BRANCH=dev SHA=18a3b809275c395b9a2730c78d6bc0f9b06671e1
2929
RUN <<EOF
3030
cd stable-diffusion
3131
git fetch

services/lstein/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pip install -r requirements.txt
2323
EOF
2424

2525

26-
ARG BRANCH=development SHA=2b7e3abe57963d199f1d825ddef87ae154c81045
26+
ARG BRANCH=development SHA=a9aa4e45aa6f5d5a2aa385349131d8733dd380fa
2727
RUN <<EOF
2828
git fetch
2929
git reset --hard
@@ -32,11 +32,12 @@ git reset --hard ${SHA}
3232
pip install -r requirements.txt
3333
EOF
3434

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

3737
COPY . /docker/
3838
RUN <<EOF
3939
python3 /docker/info.py /stable-diffusion/frontend/dist/index.html
40+
touch ~/.invokeai
4041
EOF
4142

4243

@@ -45,4 +46,4 @@ EXPOSE 7860
4546

4647

4748
ENTRYPOINT ["/docker/entrypoint.sh"]
48-
CMD python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
49+
CMD python3 -u scripts/invoke.py --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir . --outdir /output ${CLI_ARGS}

services/lstein/entrypoint.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers
1919
MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers
2020
MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers
2121

22-
MOUNTS["${ROOT}/configs/models.yaml"]=/docker/models.yaml
22+
2323
# hacks
2424
MOUNTS["/opt/conda/lib/python3.10/site-packages/facexlib/weights"]=/data/.cache/
2525
MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
2626

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

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

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

4746
exec "$@"

0 commit comments

Comments
 (0)