From 5450583be1f6b215ad5954ff5e0a9863ea6643fe Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Fri, 4 Nov 2022 22:41:38 +0100 Subject: [PATCH] Deepdanbooru Support (#194) Builds on top of #150 Thanks to @pirahtays Co-authored-by: Imaginator Co-authored-by: pirahtays <35934562+pirahtays@users.noreply.github.com> --- data/.gitignore | 1 + docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 3 +++ services/AUTOMATIC1111/entrypoint.sh | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/.gitignore b/data/.gitignore index d4efe83..9828caa 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -13,6 +13,7 @@ /SwinIR /ScuNET /LDSR +/Deepdanbooru /Hypernetworks /VAE /embeddings diff --git a/docker-compose.yml b/docker-compose.yml index 4f54d3f..e08a03d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:9 + image: sd-auto:10 environment: - CLI_ARGS=--allow-code --medvram --xformers diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index b843f8a..24b9654 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -59,6 +59,9 @@ RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeFormer/requirements.txt +ARG DEEPDANBOORU="0" +RUN [[ "${DEEPDANBOORU:-0}" == "0" ]] && : || pip install tensorflow-cpu==2.10 tensorflow-io==0.27.0 git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26#egg=deepdanbooru + # Note: don't update the sha of previous versions because the install will take forever # instead, update the repo state in a later step diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index 781e737..e7e2f13 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -29,6 +29,7 @@ MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR" MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET" MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR" MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks" +MOUNTS["${ROOT}/models/deepbooru"]="/data/Deepdanbooru" MOUNTS["${ROOT}/embeddings"]="/data/embeddings" MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json" @@ -58,5 +59,4 @@ if [ -f "/data/config/auto/startup.sh" ]; then popd fi - exec "$@"