From 672d3785a393151d6aa0391dca7cb76c801f2478 Mon Sep 17 00:00:00 2001
From: Pirahtays <mriegel@gmail.com>
Date: Thu, 3 Nov 2022 01:18:25 +0000
Subject: [PATCH] Reworked to remove script.

---
 services/AUTOMATIC1111/Dockerfile               | 10 +++++-----
 services/AUTOMATIC1111/optional-deepdanbooru.sh |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 services/AUTOMATIC1111/optional-deepdanbooru.sh

diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 6b7a829..1e20e79 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -57,11 +57,8 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
 # TODO: move to top
 RUN apt-get install jq moreutils -y
 
-COPY . /docker
-RUN chmod +x /docker/*.sh
-
 ARG DEEPDANBOORU="0"
-RUN [[ ${DEEPDANBOORU:-"0"} == "0" ]] && : || /docker/optional-deepdanbooru.sh
+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
@@ -84,7 +81,10 @@ RUN pip install opencv-python-headless \
 COPY --from=xformers /wheel.whl xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
 RUN pip install xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
 
-RUN python3 /docker/info.py ${ROOT}/modules/ui.py
+COPY . /docker
+RUN <<EOF
+chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+EOF
 
 ENV CLI_ARGS=""
 WORKDIR ${WORKDIR}
diff --git a/services/AUTOMATIC1111/optional-deepdanbooru.sh b/services/AUTOMATIC1111/optional-deepdanbooru.sh
deleted file mode 100644
index 34478e3..0000000
--- a/services/AUTOMATIC1111/optional-deepdanbooru.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pip install tensorflow-cpu==2.10
-pip install tensorflow-io==0.27.0 
-pip install git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26#egg=deepdanbooru deepdanbooru