Merge a282e3cf5b into 802d0bcd68

This commit fixes an issue in the `entrypoint.sh` script where the directory was not being changed back to its original location after running the model download script for Krita. The `cd ..` command has been replaced with `cd -`, which correctly returns to the previous working directory, ensuring that subsequent commands in the script are executed from the expected path. This change prevents potential errors and ensures the script behaves as intended.

.gitignore

@@ -1,5 +1,6 @@
 /.devcontainer
 /docker-compose.override.yml
+/.env
 
 # VSCode specific
 *.code-workspace

services/comfy/Dockerfile

@@ -25,23 +25,14 @@ ARG USE_INPAINT=false
 # comfyui-tooling-nodes
 ARG USE_TOOLING=false
 
-# Support both root and non-root
-ARG SET_USER=$USE_USER SET_GROUP=$USE_GROUP
-RUN if [ ${USE_UID} -eq 0 ]; then SET_USER=root; fi; \
-  if [ ${USE_GID} -eq 0 ]; then SET_GROUP=root; fi
-
-# Enable required dependencies for Krita
-ARG SET_CNAUX=$USE_CNAUX SET_IPAPLUS=$USE_IPAPLUS
-ARG SET_INPAINT=$USE_INPAINT SET_TOOLING=$USE_TOOLING
-RUN if [ ${USE_KRITA} = "true" ]; then SET_CNAUX="true"; SET_IPAPLUS="true"; \
-    SET_INPAINT="true"; SET_TOOLING="true"; fi
-
-ENV USE_USER=$SET_USER USE_GROUP=$SET_GROUP USE_CNAUX=$SET_CNAUX
-ENV USE_IPAPLUS=$SET_IPAPLUS USE_INPAINT=$SET_INPAINT USE_TOOLING=$SET_TOOLING
+ENV USE_CNAUX=$USE_CNAUX USE_IPAPLUS=$USE_IPAPLUS
+ENV USE_INPAINT=$USE_INPAINT USE_TOOLING=$USE_TOOLING
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 USE_EDGE=$USE_EDGE
 ENV USE_GGUF=$USE_GGUF USE_XFLUX=$USE_XFLUX ROOT=/stable-diffusion
 ENV CACHE=/home/$USE_USER/.cache USE_KRITA=$USE_KRITA
 
+RUN mkdir -p ${ROOT} ${CACHE}/pip /home/${USE_USER}
+
 # User/Group
 RUN if [ ${USE_GID} -ne 0 ]; then \
     groupadd -r ${USE_GROUP} -g ${USE_GID}; \
@@ -49,10 +40,9 @@ RUN if [ ${USE_GID} -ne 0 ]; then \
   if [ ${USE_GID} -ne 0 ]; then \
     useradd --no-log-init -m -r -g ${USE_GROUP} ${USE_USER} -u ${USE_UID}; \
   fi; \
-  mkdir -p ${ROOT} && chown ${USE_UID}:${USE_GID} ${ROOT} && mkdir -p ${CACHE}/pip && chown -R ${USE_UID}:${USE_GID} ${CACHE}
-RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} chown -R ${USE_UID}:${USE_UID} ${CACHE}
+  chown -R ${USE_UID}:${USE_GID} ${ROOT} ${CACHE} /home/${USE_USER}
 
-RUN apt-get update && apt-get install -y git
+RUN apt-get update && apt-get install -y git python3-pip
 RUN if [ "${USE_XFLUX}" = "true" ] || [ "${USE_KRITA}" = "true" ] || [ "${USE_CNAUX}" = "true" ]; then \
     apt-get install -y libgl1-mesa-glx python3-opencv; \
   fi
@@ -72,10 +62,10 @@ RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} \
   git reset --hard ${VERSION}' && \
   pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
   if [ "${USE_KRITA}" = "true" ]; then \
-    pip --cache-dir=${CACHE}/pip install aiohttp tqdm && \
     git clone https://github.com/Acly/krita-ai-diffusion.git && \
     cd krita-ai-diffusion && git checkout main && \
-    git submodule update --init && cd ..; \
+    git submodule update --init && \
+    pip --cache-dir=${CACHE}/pip install aiohttp tqdm && cd ..; \
   fi; \
   if [ "${USE_GGUF}" = "true" ]; then \
     git clone https://github.com/city96/ComfyUI-GGUF.git && \
@@ -87,23 +77,23 @@ RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} \
     cd x-flux-comfyui && git checkout main && \
     pip --cache-dir=${CACHE}/pip install -r requirements.txt && cd ..; \
   fi; \
-  if [ "${USE_CNAUX}" = "true" ]; then \
+  if [ "${USE_CNAUX}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
     git clone https://github.com/Fannovel16/comfyui_controlnet_aux.git && \
     cd comfyui_controlnet_aux && git checkout main && \
     pip --cache-dir=${CACHE}/pip install -r requirements.txt && \
     # This extra step to separate onnxruntime installation is required to restore onnx cuda support \
     pip --cache-dir=${CACHE}/pip install onnxruntime && pip --cache-dir=${CACHE}/pip install onnxruntime-gpu && cd ..; \
   fi; \
-  if [ "${USE_IPAPLUS}" = "true" ]; then \
+  if [ "${USE_IPAPLUS}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
     git clone https://github.com/cubiq/ComfyUI_IPAdapter_plus.git && \
     cd ComfyUI_IPAdapter_plus && git checkout main && cd ..; \
   fi; \
-  if [ "${USE_INPAINT}" = "true" ]; then \
+  if [ "${USE_INPAINT}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
     git clone https://github.com/Acly/comfyui-inpaint-nodes.git && \
     cd comfyui-inpaint-nodes && git checkout main && \
     pip --cache-dir=${CACHE}/pip install opencv-python && cd ..; \
   fi; \
-  if [ "${USE_TOOLING}" = "true" ]; then \
+  if [ "${USE_TOOLING}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then \
     git clone https://github.com/Acly/comfyui-tooling-nodes.git && \
     cd comfyui-tooling-nodes && git checkout main && cd ..; \
   fi
@@ -115,4 +105,4 @@ RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
 ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
+CMD python3 -u main.py --listen --port 7860 ${CLI_ARGS}

services/comfy/entrypoint.sh

@@ -26,52 +26,53 @@ done
 if [ "${UPDATE_CUSTOM_NODES:-false}" = "true" ]; then
   find /data/config/comfy/custom_nodes/ -mindepth 1 -maxdepth 1 -type d | while read NODE
     do echo "---- ${NODE##*/} ----"
-    cd $NODE && git pull; cd ..
+    set +e
+    cd "$NODE" && git pull; cd ..;
+    set -e
   done
 fi
 
 if [ "${USE_KRITA}" = "true" ]; then
-  if [ "${KRITA_DOWNLOAD_MODELS:-false}" = "true" ]; then
-    cd "${ROOT}/krita-ai-diffusion/scripts" && python download_models.py --verbose --retry-attempts 10 --continue-on-error --recommended /data && cd ..
-  fi
-  [ -d "${ROOT}/models/upscale_models" ] && mv -v "${ROOT}/models/upscale_models" "${ROOT}/models/upscale_models.stock"
+  [ -d "${ROOT}/models/upscale_models" ] && rm -rf "${ROOT}/models/upscale_models"
   if [ ! -L "${ROOT}/models/upscale_models" ]; then
     cd "${ROOT}/models"
-    ln -sfT /data/models/upscale_models upscale_models
+    ln -sfT /data/models/upscale_models upscale_models && cd ..
+  fi
+  if [ "${KRITA_DOWNLOAD_MODELS:-false}" = "true" ]; then
+    cd "${ROOT}/krita-ai-diffusion/scripts" && python3 download_models.py --verbose --retry-attempts 10 --continue-on-error --recommended /data && cd -
   fi
-  export USE_CNAUX="true" USE_IPAPLUS="true" USE_INPAINT="true"; USE_TOOLING="true"
 fi
 if [ "${USE_GGUF}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/ComfyUI-GGUF" ] && mv "${ROOT}/ComfyUI-GGUF" "${CUSTOM_NODES}"/
+  [ ! -e "${CUSTOM_NODES}/ComfyUI-GGUF" ] && cp -a "${ROOT}/ComfyUI-GGUF" "${CUSTOM_NODES}"/
 fi
 if [ "${USE_XFLUX}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/x-flux-comfyui" ] && mv "${ROOT}/x-flux-comfyui" "${CUSTOM_NODES}"/
+  [ ! -e "${CUSTOM_NODES}/x-flux-comfyui" ] && cp -a "${ROOT}/x-flux-comfyui" "${CUSTOM_NODES}"/
   [ ! -e "/data/models/clip_vision" ] && mkdir -p /data/models/clip_vision
   [ ! -e "/data/models/clip_vision/model.safetensors" ] && cd /data/models/clip_vision && \
-    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
+    python3 -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
       "https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/model.safetensors" "model.safetensors"
   [ ! -e "/data/models/xlabs" ] && mkdir -p /data/models/xlabs/{ipadapters,loras,controlnets}
   [ ! -e "/data/models/xlabs/ipadapters/flux-ip-adapter.safetensors" ] && cd /data/models/xlabs/ipadapters && \
-    python -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
+    python3 -c 'import sys; from urllib.request import urlopen; from pathlib import Path; Path(sys.argv[2]).write_bytes(urlopen(sys.argv[1]).read())' \
       "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors" "flux-ip-adapter.safetensors"
   [ -d "${ROOT}/models/xlabs" ] && rm -rf "${ROOT}/models/xlabs"
   [ ! -e "${ROOT}/models/xlabs" ] && cd "${ROOT}/models" && ln -sT /data/models/xlabs xlabs && cd ..
 fi
-if [ "${USE_CNAUX}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/comfyui_controlnet_aux" ] && mv "${ROOT}/comfyui_controlnet_aux" "${CUSTOM_NODES}"/
+if [ "${USE_CNAUX}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui_controlnet_aux" ] && cp -a "${ROOT}/comfyui_controlnet_aux" "${CUSTOM_NODES}"/
 fi
-if [ "${USE_IPAPLUS}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/ComfyUI_IPAdapter_plus" ] && mv "${ROOT}/ComfyUI_IPAdapter_plus" "${CUSTOM_NODES}"/
+if [ "${USE_IPAPLUS}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/ComfyUI_IPAdapter_plus" ] && cp -a "${ROOT}/ComfyUI_IPAdapter_plus" "${CUSTOM_NODES}"/
 fi
-if [ "${USE_INPAINT}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/comfyui-inpaint-nodes" ] && mv "${ROOT}/comfyui-inpaint-nodes" "${CUSTOM_NODES}"/
+if [ "${USE_INPAINT}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-inpaint-nodes" ] && cp -a "${ROOT}/comfyui-inpaint-nodes" "${CUSTOM_NODES}"/
 fi
-if [ "${USE_TOOLING}" = "true" ]; then
-  [ ! -e "${CUSTOM_NODES}/comfyui-tooling-nodes" ] && mv "${ROOT}/comfyui-tooling-nodes" "${CUSTOM_NODES}"/
+if [ "${USE_TOOLING}" = "true" ] || [ "${USE_KRITA}" = "true" ]; then
+  [ ! -e "${CUSTOM_NODES}/comfyui-tooling-nodes" ] && cp -a "${ROOT}/comfyui-tooling-nodes" "${CUSTOM_NODES}"/
 fi
 
 if [ -f "/data/config/comfy/startup.sh" ]; then
-  pushd ${ROOT}
+  pushd "${ROOT}"
   . /data/config/comfy/startup.sh
   popd
 fi