release image v5

Author: OhYee

src/Makefile

@@ -13,11 +13,11 @@ help: ## 帮助文件
 
 NAMESPACE=aliyun-fc
 REPO=fc-stable-diffusion
-BASE_TAG=basev3
+BASE_TAG=basev4
 
-SD15_VERSION=v4
-ANIME_VERSION=v4
-REALMAN_VERSION=v4
+SD15_VERSION=v5
+ANIME_VERSION=v5
+REALMAN_VERSION=v5
 
 
 push: push-beijing push-shanghai push-shenzhen push-hangzhou ## push 镜像到所有 registry

src/code/images/Dockerfile

@@ -26,7 +26,7 @@ RUN aria2c -x 16 --dir "/" --out "sd_xl_base_1.0_0.9vae.safetensors" "https://hu
 RUN aria2c -x 16 --dir "/" --out "sdxl_vae.safetensors" "https://huggingface.co/stabilityai/sdxl-vae/resolve/main/sdxl_vae.safetensors" 
 
 
-FROM registry.cn-hangzhou.aliyuncs.com/aliyun-fc/fc-stable-diffusion:basev3 as base
+FROM registry.cn-hangzhou.aliyuncs.com/aliyun-fc/fc-stable-diffusion:basev4 as base
 
 COPY --from=models /cIF8Anime2.43ol.ckpt ${SD_BUILTIN}/models/VAE/cIF8Anime2.43ol.ckpt
 # COPY --from=models /vae-ft-mse-840000-ema-pruned.safetensors ${SD_BUILTIN}/models/VAE/vae-ft-mse-840000-ema-pruned.safetensors

src/code/images/base/Dockerfile

@@ -68,15 +68,15 @@ RUN aria2c -x 8 --dir "/" --out "inswapper_128.onnx" "https://huggingface.co/hen
 RUN aria2c -x 8 --dir "/" --out "detector.onnx" "https://huggingface.co/s0md3v/nudity-checker/resolve/main/detector.onnx" 
 RUN aria2c -x 8 --dir "/" --out "control_v11p_sd15_scribble.pth" "https://huggingface.co/lllyasviel/ControlNet-v1-1/resolve/main/control_v11p_sd15_scribble.pth"
 RUN aria2c -x 8 --dir "/" --out "control_v11p_sd15_scribble.yaml" "https://huggingface.co/lllyasviel/ControlNet-v1-1/resolve/main/control_v11p_sd15_scribble.yaml"
-RUN aria2c -x 8 --dir "/" --out "diffusion_pytorch_model.safetensors" "https://huggingface.co/ioclab/control_v1p_sd15_brightness/resolve/main/diffusion_pytorch_model.safetensors"
+RUN aria2c -x 8 --dir "/" --out "control_v1p_sd15_illumination.safetensors" "https://huggingface.co/ioclab/ioc-controlnet/resolve/main/models/control_v1p_sd15_illumination.safetensors"
 
 
 # ############################# 
 # #           dist            #
 # #############################
 
 
-FROM python:3.10.9-slim as base
+FROM python:3.10.9-slim as sd_base
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
@@ -109,10 +109,15 @@ RUN --mount=type=cache,target=/root/.cache/pip \
         insightface==0.7.3 tensorflow ifnude && \
     pip install xformers==0.0.20 taming-transformers-rom1504 && \
     pip install torch==2.0.1 torchvision==0.15.2 --index-url https://download.pytorch.org/whl/cu118
-    
+
+# fix using lora in only api mode 
+COPY ./fix.diff ${ROOT}/fix.diff
+RUN cd ${ROOT} && git apply --whitespace=fix  fix.diff
 
 # ==========================
 
+FROM sd_base as base
+
 ENV SD_BUILTIN=/built-in
 COPY ./sd-resource ${SD_BUILTIN}
 RUN cp -R ${ROOT}/scripts ${SD_BUILTIN}/scripts
@@ -143,7 +148,7 @@ COPY --from=models /detector.onnx ${SD_BUILTIN}/root/.ifnude/detector.onnx
 # controlnet 
 COPY --from=models /control_v11p_sd15_scribble.pth ${SD_BUILTIN}/models/ControlNet/control_v11p_sd15_scribble.pth
 COPY --from=models /control_v11p_sd15_scribble.yaml ${SD_BUILTIN}/models/ControlNet/control_v11p_sd15_scribble.yaml
-COPY --from=models /diffusion_pytorch_model.safetensors ${SD_BUILTIN}/models/ControlNet/control_v1p_sd15_brightness
+COPY --from=models /control_v1p_sd15_illumination.safetensors ${SD_BUILTIN}/models/ControlNet/control_v1p_sd15_illumination.safetensors
 
 # adetailer
 COPY --from=extensions /models--Bingsu--adetailer ${SD_BUILTIN}/root/.cache/huggingface/hub/models--Bingsu--adetailer

src/code/images/base/Dockerfile.test

@@ -1,3 +1,12 @@
-FROM registry.cn-hangzhou.aliyuncs.com/aliyun-fc/fc-stable-diffusion:realman-v3
+FROM alpine:3.17 as models
 
-RUN cp -R ${ROOT}/scripts ${SD_BUILTIN}/scripts && sed -i ${SD_BUILTIN}/config.json -e 's/"sd-webui-controlnet",//'
+RUN apk add --no-cache aria2
+
+RUN aria2c -x 8 --dir "/" --out "control_v1p_sd15_illumination.safetensors" "https://huggingface.co/ioclab/ioc-controlnet/resolve/main/models/control_v1p_sd15_illumination.safetensors"
+
+
+FROM registry.cn-hangzhou.aliyuncs.com/aliyun-fc/fc-stable-diffusion:sd1.5-v3
+
+RUN cp -R ${ROOT}/scripts ${SD_BUILTIN}/scripts && sed -i ${SD_BUILTIN}/config.json -e 's/"sd-webui-controlnet",//'
+COPY --from=models /control_v1p_sd15_illumination.safetensors ${SD_BUILTIN}/models/ControlNet/control_v1p_sd15_illumination.safetensors
+COPY ./entrypoint.sh /docker/entrypoint.sh

src/code/images/base/entrypoint.sh

@@ -84,6 +84,7 @@ MOUNTS["${ROOT}/extensions"]="${NAS_DIR}/extensions"
 MOUNTS["${ROOT}/outputs"]="${NAS_DIR}/outputs"
 MOUNTS["${ROOT}/styles.csv"]="${NAS_DIR}/styles.csv"
 MOUNTS["${ROOT}/scripts"]="${NAS_DIR}/scripts"
+MOUNTS["${ROOT}/textual_inversion_templates"]="${NAS_DIR}/textual_inversion_templates"
 # MOUNTS["${ROOT}/javascript"]="${NAS_DIR}/javascript"
 # MOUNTS["${ROOT}/html"]="${NAS_DIR}/html"
 MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="${NAS_DIR}/repositories/CodeFormer/weights/facelib"

src/code/images/base/fix.diff

@@ -0,0 +1,12 @@
+diff --git a/webui.py b/webui.py
+index 6bf06854..e44b755e 100644
+--- a/webui.py
++++ b/webui.py
+@@ -368,6 +368,7 @@ def api_only():
+     setup_middleware(app)
+     api = create_api(app)
+ 
++    modules.script_callbacks.before_ui_callback()
+     modules.script_callbacks.app_started_callback(None, app)
+ 
+     print(f"Startup time: {startup_timer.summary()}.")