diff --git a/comfyui-build/docker-entrypoint.sh b/comfyui-build/docker-entrypoint.sh index 0a02746..2d3f8f5 100644 --- a/comfyui-build/docker-entrypoint.sh +++ b/comfyui-build/docker-entrypoint.sh @@ -38,14 +38,22 @@ if [ ! -d "ComfyUI" ]; then echo "ComfyUI directory doesn't exist, cloning repository..." git clone https://github.com/comfyanonymous/ComfyUI.git elif [ ! -d "ComfyUI/.git" ]; then - echo "ComfyUI directory exists but is not a valid git repository, clearing and re-cloning..." - rm -rf ComfyUI - git clone https://github.com/comfyanonymous/ComfyUI.git + echo "ComfyUI directory exists but is not a valid git repository..." + echo "Attempting to initialize git repository in existing directory..." + cd ComfyUI + # Initialize as git repository and add remote + git init + git remote add origin https://github.com/comfyanonymous/ComfyUI.git + echo "Fetching latest ComfyUI code..." + git fetch origin + git checkout -f main || git checkout -f master + git reset --hard origin/main || git reset --hard origin/master + cd .. else echo "ComfyUI directory already exists and is a valid git repository..." cd ComfyUI echo "Pulling latest updates..." - git pull + git pull || echo "Git pull failed, continuing with existing code..." cd .. fi diff --git a/docker-compose.yaml b/docker-compose.yaml index b211ed6..1b9168a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -106,31 +106,7 @@ services: rocm-network: ipv4_address: 172.28.0.5 volumes: - - ./User-Directories/ComfyUI/venv/audio_encoders:/app/ComfyUI/venv - - ./User-Directories/ComfyUI/models/audio_encoders:/app/ComfyUI/models/audio_encoders - - ./User-Directories/ComfyUI/models/checkpoints:/app/ComfyUI/models/checkpoints - - ./User-Directories/ComfyUI/models/clip:/app/ComfyUI/models/clip - - ./User-Directories/ComfyUI/models/clip_vision:/app/ComfyUI/models/clip_vision - - ./User-Directories/ComfyUI/models/controlnet:/app/ComfyUI/models/controlnet - - ./User-Directories/ComfyUI/models/diffusers:/app/ComfyUI/models/diffusers - - ./User-Directories/ComfyUI/models/diffusion_models:/app/ComfyUI/models/diffusion_models - - ./User-Directories/ComfyUI/models/embeddings:/app/ComfyUI/models/embeddings - - ./User-Directories/ComfyUI/models/gligen:/app/ComfyUI/models/gligen - - ./User-Directories/ComfyUI/models/hypernetworks:/app/ComfyUI/models/hypernetworks - - ./User-Directories/ComfyUI/models/latent_upscale_models:/app/ComfyUI/models/latent_upscale_models - - ./User-Directories/ComfyUI/models/loras:/app/ComfyUI/models/loras - - ./User-Directories/ComfyUI/models/model_patches:/app/ComfyUI/models/model_patches - - ./User-Directories/ComfyUI/models/photomaker:/app/ComfyUI/models/photomaker - - ./User-Directories/ComfyUI/models/style_models:/app/ComfyUI/models/style_models - - ./User-Directories/ComfyUI/models/text_encoders:/app/ComfyUI/models/text_encoders - - ./User-Directories/ComfyUI/models/unet:/app/ComfyUI/models/unet - - ./User-Directories/ComfyUI/models/upscale_models:/app/ComfyUI/models/upscale_models - - ./User-Directories/ComfyUI/models/vae:/app/ComfyUI/models/vae - - ./User-Directories/ComfyUI/models/vae_approx:/app/ComfyUI/models/vae_approx - - ./User-Directories/ComfyUI/output:/app/ComfyUI/output - - ./User-Directories/ComfyUI/custom_nodes:/app/ComfyUI/custom_nodes - - ./User-Directories/ComfyUI/input:/app/ComfyUI/input - - ./User-Directories/ComfyUI/temp:/app/ComfyUI/temp + - ./User-Directories/ComfyUI/:/app/ComfyUI:Z - /etc/resolv.conf:/etc/resolv.conf:ro devices: - /dev/kfd:/dev/kfd diff --git a/setup-directories.sh b/setup-directories.sh index 93ecf7e..d2eec44 100644 --- a/setup-directories.sh +++ b/setup-directories.sh @@ -75,76 +75,8 @@ echo "🎨 Setting up ComfyUI directory structure..." mkdir -p ./ComfyUI -# Define base directory -BASE_DIR="./ComfyUI" - -# Create model directories -echo "🤖 Creating ComfyUI model directories..." -mkdir -p "${BASE_DIR}/venv" -mkdir -p "${BASE_DIR}/models/audio_encoders" -mkdir -p "${BASE_DIR}/models/checkpoints" -mkdir -p "${BASE_DIR}/models/clip" -mkdir -p "${BASE_DIR}/models/clip_vision" -mkdir -p "${BASE_DIR}/models/controlnet" -mkdir -p "${BASE_DIR}/models/diffusers" -mkdir -p "${BASE_DIR}/models/diffusion_models" -mkdir -p "${BASE_DIR}/models/embeddings" -mkdir -p "${BASE_DIR}/models/gligen" -mkdir -p "${BASE_DIR}/models/hypernetworks" -mkdir -p "${BASE_DIR}/models/latent_upscale_models" -mkdir -p "${BASE_DIR}/models/loras" -mkdir -p "${BASE_DIR}/models/model_patches" -mkdir -p "${BASE_DIR}/models/photomaker" -mkdir -p "${BASE_DIR}/models/style_models" -mkdir -p "${BASE_DIR}/models/text_encoders" -mkdir -p "${BASE_DIR}/models/unet" -mkdir -p "${BASE_DIR}/models/upscale_models" -mkdir -p "${BASE_DIR}/models/vae" -mkdir -p "${BASE_DIR}/models/vae_approx" - -# Create output and custom nodes directories -echo "📁 Creating ComfyUI output and custom directories..." -mkdir -p "${BASE_DIR}/output" -mkdir -p "${BASE_DIR}/custom_nodes" -mkdir -p "${BASE_DIR}/input" -mkdir -p "${BASE_DIR}/temp" # Set appropriate permissions echo "🔒 Setting ComfyUI directory permissions..." chmod -R 755 "${BASE_DIR}" - -echo "✅ ComfyUI directory structure created successfully!" -echo "" -echo "📂 Created ComfyUI directories:" -echo " Models:" -echo " - ${BASE_DIR}/models/audio_encoders" -echo " - ${BASE_DIR}/models/checkpoints" -echo " - ${BASE_DIR}/models/clip" -echo " - ${BASE_DIR}/models/clip_vision" -echo " - ${BASE_DIR}/models/controlnet" -echo " - ${BASE_DIR}/models/diffusers" -echo " - ${BASE_DIR}/models/diffusion_models" -echo " - ${BASE_DIR}/models/embeddings" -echo " - ${BASE_DIR}/models/gligen" -echo " - ${BASE_DIR}/models/hypernetworks" -echo " - ${BASE_DIR}/models/latent_upscale_models" -echo " - ${BASE_DIR}/models/loras" -echo " - ${BASE_DIR}/models/model_patches" -echo " - ${BASE_DIR}/models/photomaker" -echo " - ${BASE_DIR}/models/style_models" -echo " - ${BASE_DIR}/models/text_encoders" -echo " - ${BASE_DIR}/models/unet" -echo " - ${BASE_DIR}/models/upscale_models" -echo " - ${BASE_DIR}/models/vae" -echo " - ${BASE_DIR}/models/vae_approx" -echo "" -echo " Working directories:" -echo " - ${BASE_DIR}/output" -echo " - ${BASE_DIR}/custom_nodes" -echo " - ${BASE_DIR}/input" -echo " - ${BASE_DIR}/temp" -echo "" -echo "💡 You can now run ComfyUI containers with proper volume mounts." -echo "💡 Place your models in the appropriate subdirectories under ${BASE_DIR}/models/" -echo "💡 Generated images will be saved to ${BASE_DIR}/output/" -echo "💡 Custom nodes can be placed in ${BASE_DIR}/custom_nodes/" \ No newline at end of file +echo "✅ ComfyUI directory created successfully at ./ComfyUI" \ No newline at end of file