Merge pull request #79 from mmartial/20251006

20251006

Author: mmartial

Makefile

@@ -5,7 +5,7 @@ DOCKER_CMD=docker
 DOCKER_PRE="NVIDIA_VISIBLE_DEVICES=all"
 DOCKER_BUILD_ARGS=
 
-COMFYUI_NVIDIA_DOCKER_VERSION=20251005
+COMFYUI_NVIDIA_DOCKER_VERSION=20251006
 
 COMFYUI_CONTAINER_NAME=comfyui-nvidia-docker
 

README.md

@@ -992,6 +992,7 @@ Once you are confident that you have migrated content from the old container's f
 
 # 7. Changelog
 
+- 20251006: Fix environment variable loading (side effect of fix for loading configuration file overrides, as reported in [Issue 78](https://github.com/mmartial/ComfyUI-Nvidia-Docker/issues/78))
 - 20251005: Fix loading configuration file overrides (e.g. `comfyui-nvidia_config.sh`) + extended `userscripts_dir` to support Nunchaku and xformers.
 - 20251001: Added additional libraries to the base image to support a few custom nodes + new userscripts_dir script for onnxruntime + added Tailscale Docker Compose usage.
 - 20250817: Added automatic PyTorch selection for `PREINSTALL_TORCH` environment variable based on CUDA version + added `DISABLE_UPGRADES` and `PREINSTALL_TORCH_CMD` environment variables.

init.bash

@@ -55,18 +55,38 @@ if [ ! -d $itdir ]; then mkdir $itdir; chmod 777 $itdir; fi
 if [ ! -d $itdir ]; then error_exit "Failed to create $itdir"; fi
 
 # Set user and group id
+it=$itdir/comfy_user_uid
+if [ -z "${WANTED_UID+x}" ]; then
+  if [ -f $it ]; then WANTED_UID=$(cat $it); fi
+fi
 WANTED_UID=${WANTED_UID:-1024}
+if [ ! -f $it ]; then write_worldtmpfile $it "$WANTED_UID"; fi
 echo "-- WANTED_UID: \"${WANTED_UID}\""
 
+it=$itdir/comfy_user_gid
+if [ -z "${WANTED_GID+x}" ]; then
+  if [ -f $it ]; then WANTED_GID=$(cat $it); fi
+fi
 WANTED_GID=${WANTED_GID:-1024}
+if [ ! -f $it ]; then write_worldtmpfile $it "$WANTED_GID"; fi
 echo "-- WANTED_GID: \"${WANTED_GID}\""
 
 # Set security level
+it=$itdir/comfy_security_level
+if [ -z "${SECURITY_LEVEL+x}" ]; then
+  if [ -f $it ]; then SECURITY_LEVEL=$(cat $it); fi
+fi
 SECURITY_LEVEL=${SECURITY_LEVEL:-"normal"}
+if [ ! -f $it ]; then write_worldtmpfile $it "$SECURITY_LEVEL"; fi
 echo "-- SECURITY_LEVEL: \"${SECURITY_LEVEL}\""
 
 # Set base directory (if not used, set to $ignore_value)
+it=$itdir/comfy_base_directory
+if [ -z "${BASE_DIRECTORY+x}" ]; then
+  if [ -f $it ]; then BASE_DIRECTORY=$(cat $it); fi
+fi
 BASE_DIRECTORY=${BASE_DIRECTORY:-"$ignore_value"}
+if [ ! -f $it ]; then write_worldtmpfile $it "$BASE_DIRECTORY"; fi
 echo "-- BASE_DIRECTORY: \"${BASE_DIRECTORY}\""
 
 # Validate base directory
@@ -164,7 +184,7 @@ if [ "A${whoami}" == "Acomfytoo" ]; then
   echo "-- Running as comfytoo, will switch comfy to the desired UID/GID"
   # The script is started as comfytoo -- UID/GID 1025/1025
 
-FORCE_CHOWN=${FORCE_CHOWN:-"false"} # any value works, empty value or false means disabled
+  FORCE_CHOWN=${FORCE_CHOWN:-"false"} # any value works, empty value or false means disabled
   if [ "A${FORCE_CHOWN}" != "Afalse" ]; then
     echo "-- Force chown mode enabled, will force change directory ownership as comfy user during script rerun (might be slow)"
     sudo touch /etc/comfy_force_chown