diff --git a/docker/basic/Dockerfile b/docker/basic/Dockerfile deleted file mode 100644 index 4c91cbe..0000000 --- a/docker/basic/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM pytorch/pytorch:latest - -# ARG DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 - -RUN apt update && apt-get install -y git rsync nginx wget nano ffmpeg libsm6 libxext6 cron && apt-get clean - -ARG GITACCESSKEY - -RUN mkdir -p ~/.ssh && chmod 700 ~/.ssh && echo ${GITACCESSKEY} >> ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519 - -ENV ROOT=/comfyui-launcher - -# COPY ./models.sh /scripts/models.sh -# RUN /scripts/models.sh - -COPY ./nodes.sh /scripts/nodes.sh -RUN /scripts/nodes.sh - -RUN eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_ed25519 && ssh-keyscan github.com > ~/.ssh/githubKey && ssh-keygen -lf ~/.ssh/githubKey && cat ~/.ssh/githubKey >> ~/.ssh/known_hosts - -WORKDIR ${ROOT} - -COPY ./build.sh /scripts/build.sh - -RUN /scripts/build.sh - -COPY ./models.sh /scripts/models.sh - -COPY ./start.sh /scripts/start.sh - -COPY ./cron.sh /scripts/cron.sh - -CMD ["/scripts/start.sh"] \ No newline at end of file diff --git a/docker/basic/build.sh b/docker/basic/build.sh deleted file mode 100755 index 83e6696..0000000 --- a/docker/basic/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -Eeuo pipefail - -ROOT=/comfyui-launcher - -echo $ROOT -ls -lha $ROOT -ls -lha / - -echo "Installing pm2..." -apt-get install -y ca-certificates curl gnupg ufw -mkdir -p /etc/apt/keyrings -curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list -apt-get update -apt-get install -y nodejs git-lfs -npm install -g npm@9.8.0 -npm install -g pm2@latest -pip install --ignore-installed websocket-client flask gdown - -cd ${ROOT} - -apt install -y nvtop - -echo "~~READY~~" \ No newline at end of file diff --git a/docker/basic/cron.sh b/docker/basic/cron.sh deleted file mode 100755 index c9cab69..0000000 --- a/docker/basic/cron.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -FOLDER_PATH="/comfyui-launcher/ComfyUI/output" - -# Run the cron job every hour -CRON_JOB="0 * * * * rm -f $FOLDER_PATH/*" - -# Check if the cron job already exists -(crontab -l | grep -q "$CRON_JOB") || (crontab -l; echo "$CRON_JOB") | crontab - diff --git a/docker/basic/models.sh b/docker/basic/models.sh index 2bf629d..89725d3 100755 --- a/docker/basic/models.sh +++ b/docker/basic/models.sh @@ -9,6 +9,11 @@ mkdir -p ${ROOT}/models/controlnet mkdir -p ${ROOT}/models/upscale_models mkdir -p ${ROOT}/models/loras mkdir -p ${ROOT}/models/ipadapter +mkdir -p ${ROOT}/models/controlnet/controlnet-canny-sdxl-1.0 +mkdir -p ${ROOT}/models/controlnet/controlnet-depth-sdxl-1.0 +mkdir -p ${ROOT}/models/controlnet/controlnet-scribble-sdxl-1.0 +mkdir -p ${ROOT}/models/controlnet/controlnet-openpose-sdxl-1.0 +mkdir -p ${ROOT}/models/controlnet/t2i-adapter-lineart-sdxl-1.0 cd ${ROOT}/models/checkpoints \ && wget https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0_0.9vae.safetensors -O sd_xl_base_1.0_0.9vae.safetensors \ @@ -19,7 +24,8 @@ cd ${ROOT}/models/checkpoints \ && wget https://edenartlab-lfs.s3.amazonaws.com/comfyui/models2/checkpoints/juggernaut_reborn.safetensors -O juggernaut_reborn.safetensors \ && wget https://huggingface.co/lllyasviel/fav_models/resolve/main/fav/realisticVisionV51_v51VAE.safetensors -O realisticVisionV51_v51VAE.safetensors \ && wget 'https://civitai.com/api/download/models/429454?type=Model&format=SafeTensor&size=pruned&fp=fp16' -O epicphotogasm_v1.safetensors \ -&& wget https://huggingface.co/stabilityai/sdxl-turbo/resolve/main/sd_xl_turbo_1.0_fp16.safetensors -O sd_xl_turbo_1.0_fp16.safetensors; +&& wget https://huggingface.co/stabilityai/sdxl-turbo/resolve/main/sd_xl_turbo_1.0_fp16.safetensors -O sd_xl_turbo_1.0_fp16.safetensors \ +&& wget https://edenartlab-lfs.s3.amazonaws.com/models/checkpoints/Eden_SDXL.safetensors -O Eden_SDXL.safetensors; cd ${ROOT}/models/upscale_models \ && wget https://github.com/Phhofm/models/releases/download/4xNomosUniDAT_otf/4xNomosUniDAT_otf.safetensors -O 4xNomosUniDAT_otf.safetensors \ @@ -30,7 +36,8 @@ cd ${ROOT}/models/upscale_models \ && wget https://huggingface.co/kaliansh/sdrep/resolve/main/RealESRGAN_x4plus_anime_6B.pth -O RealESRGAN_x4plus_anime_6B.pth; cd ${ROOT}/models/loras && wget https://edenartlab-lfs.s3.amazonaws.com/comfyui/models2/loras/SDXLrender_v2.0.safetensors \ -&& wget https://huggingface.co/digiplay/LORA/resolve/fa075647d8164b327ba07e430bdb3fd02f147a62/more_details.safetensors; +&& wget https://huggingface.co/digiplay/LORA/resolve/fa075647d8164b327ba07e430bdb3fd02f147a62/more_details.safetensors \ +&& wget https://edenartlab-lfs.s3.amazonaws.com/comfyui/models2/loras/SDXL_lora_xander.safetensors; cd ${ROOT}/models/ipadapter && wget https://edenartlab-lfs.s3.amazonaws.com/comfyui/models2/ipadapter/ip-adapter-plus_sd15.safetensors \ && wget https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15.safetensors \ @@ -42,6 +49,14 @@ cd ${ROOT}/models/ipadapter && wget https://edenartlab-lfs.s3.amazonaws.com/comf && wget https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus-face_sdxl_vit-h.safetensors \ && wget https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl.safetensors; +cd ${ROOT}/models/controlnet/controlnet-canny-sdxl-1.0 && wget https://huggingface.co/xinsir/controlnet-canny-sdxl-1.0/resolve/main/diffusion_pytorch_model_V2.safetensors -O diffusion_pytorch_model_V2.safetensors; +cd ${ROOT}/models/controlnet/controlnet-depth-sdxl-1.0 && wget https://huggingface.co/xinsir/controlnet-depth-sdxl-1.0/resolve/main/diffusion_pytorch_model.safetensors -O diffusion_pytorch_model.safetensors; +cd ${ROOT}/models/controlnet/controlnet-scribble-sdxl-1.0 && wget https://huggingface.co/xinsir/controlnet-scribble-sdxl-1.0/resolve/main/diffusion_pytorch_model.safetensors -O diffusion_pytorch_model.safetensors; +cd ${ROOT}/models/controlnet/controlnet-openpose-sdxl-1.0 && wget https://huggingface.co/xinsir/controlnet-openpose-sdxl-1.0/resolve/main/diffusion_pytorch_model.safetensors -O diffusion_pytorch_model.safetensors; +cd ${ROOT}/models/controlnet/t2i-adapter-lineart-sdxl-1.0 && wget https://huggingface.co/TencentARC/t2i-adapter-lineart-sdxl-1.0/resolve/main/diffusion_pytorch_model.safetensors -O diffusion_pytorch_model.safetensors; +cd ${ROOT}/models/controlnet && wget https://huggingface.co/lllyasviel/sd_control_collection/resolve/d1b278d0d1103a3a7c4f7c2c327d236b082a75b1/diffusers_xl_canny_full.safetensors -O diffusers_xl_canny_full.safetensors; + + cd ${ROOT}/models/clip_vision && wget https://edenartlab-lfs.s3.amazonaws.com/comfyui/models2/clip_vision/CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors; cd ${ROOT}/models/controlnet && wget https://huggingface.co/ckpt/ControlNet-v1-1/resolve/main/control_v11f1e_sd15_tile_fp16.safetensors; \ No newline at end of file diff --git a/docker/basic/nodes.sh b/docker/basic/nodes.sh index 754c6f9..1c2dd95 100755 --- a/docker/basic/nodes.sh +++ b/docker/basic/nodes.sh @@ -3,17 +3,26 @@ ROOT=/comfyui-launcher mkdir -p ${ROOT}/nodes \ -cd ${ROOT}/nodes && git clone https://github.com/ltdrdata/ComfyUI-Manager && cd "$(basename "$_" .git)" && pip install -r requirements.txt +cd ${ROOT}/nodes && git clone https://github.com/ltdrdata/ComfyUI-Manager cd ${ROOT}/nodes && git clone https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet && cd "$(basename "$_" .git)" && git reset --hard "b9c8bdc6dd47f3eb322c3194bee10afe80c5fbad" -cd ${ROOT}/nodes && git clone https://github.com/Extraltodeus/ComfyUI-AutomaticCFG && cd "$(basename "$_" .git)" && git reset --hard "2e395317b65c05a97a0ef566c4a8c7969305dafa" && pip install -r requirements.txt -cd ${ROOT}/nodes && git clone https://github.com/crystian/ComfyUI-Crystools && cd "$(basename "$_" .git)" && git reset --hard "ad2e9b8be8c601f17cf04d676a16afe538b89497" && pip install -r requirements.txt -cd ${ROOT}/nodes && git clone https://github.com/alt-key-project/comfyui-dream-project && cd "$(basename "$_" .git)" && git reset --hard "b2ddca87a95881d2b37f4602edfcc7507da39a9c" && pip install -r requirements.txt -cd ${ROOT}/nodes && git clone https://github.com/yolain/ComfyUI-Easy-Use && cd "$(basename "$_" .git)" && git reset --hard "c51d1fdea2edad09e6788eafea4312fcf1a7bb27" && pip install -r requirements.txt +cd ${ROOT}/nodes && git clone https://github.com/Extraltodeus/ComfyUI-AutomaticCFG && cd "$(basename "$_" .git)" && git reset --hard "2e395317b65c05a97a0ef566c4a8c7969305dafa" +cd ${ROOT}/nodes && git clone https://github.com/crystian/ComfyUI-Crystools && cd "$(basename "$_" .git)" && git reset --hard "ad2e9b8be8c601f17cf04d676a16afe538b89497" +cd ${ROOT}/nodes && git clone https://github.com/alt-key-project/comfyui-dream-project && cd "$(basename "$_" .git)" && git reset --hard "b2ddca87a95881d2b37f4602edfcc7507da39a9c" +cd ${ROOT}/nodes && git clone https://github.com/yolain/ComfyUI-Easy-Use && cd "$(basename "$_" .git)" && git reset --hard "c51d1fdea2edad09e6788eafea4312fcf1a7bb27" cd ${ROOT}/nodes && git clone https://github.com/shiimizu/ComfyUI-TiledDiffusion && cd "$(basename "$_" .git)" && git reset --hard "5b2d0d2c4036218c0d6460efc79790e2a54f9a22" -cd ${ROOT}/nodes && git clone https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes && cd "$(basename "$_" .git)" && git reset --hard "d78b780ae43fcf8c6b7c6505e6ffb4584281ceca" && pip install -r requirements.txt -cd ${ROOT}/nodes && git clone https://github.com/cubiq/ComfyUI_essentials && cd "$(basename "$_" .git)" && git reset --hard "64e38fd0f3b2e925573684f4a43727be80dc7d5b" && pip install -r requirements.txt +cd ${ROOT}/nodes && git clone https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes && cd "$(basename "$_" .git)" && git reset --hard "d78b780ae43fcf8c6b7c6505e6ffb4584281ceca" +cd ${ROOT}/nodes && git clone https://github.com/cubiq/ComfyUI_essentials && cd "$(basename "$_" .git)" && git reset --hard "64e38fd0f3b2e925573684f4a43727be80dc7d5b" cd ${ROOT}/nodes && git clone https://github.com/cubiq/ComfyUI_IPAdapter_plus && cd "$(basename "$_" .git)" && git reset --hard "b188a6cb39b512a9c6da7235b880af42c78ccd0d" -cd ${ROOT}/nodes && git clone https://github.com/edenartlab/eden_comfy_pipelines && cd "$(basename "$_" .git)" && git reset --hard "69d7f4f204a38626113686ec6c56281105419f1c" && pip install -r requirements.txt +cd ${ROOT}/nodes && git clone https://github.com/edenartlab/eden_comfy_pipelines && cd "$(basename "$_" .git)" && git reset --hard "69d7f4f204a38626113686ec6c56281105419f1c" cd ${ROOT}/nodes && git clone https://github.com/BadCafeCode/execution-inversion-demo-comfyui && cd "$(basename "$_" .git)" && git reset --hard "b0b489659684a1b69221db48cabb9dce5f7bb6fb" -cd ${ROOT}/nodes && git clone https://github.com/rgthree/rgthree-comfy && cd "$(basename "$_" .git)" && git reset --hard "6f82a5c72fdb36ce28b3c09eecd2d7fe493c91a1" && pip install -r requirements.txt -cd ${ROOT}/nodes && git clone https://github.com/WASasquatch/was-node-suite-comfyui && cd "$(basename "$_" .git)" && git reset --hard "b2f12387b2af5aae98d69d785709971c123a10fd" && pip install -r requirements.txt +cd ${ROOT}/nodes && git clone https://github.com/rgthree/rgthree-comfy && cd "$(basename "$_" .git)" && git reset --hard "6f82a5c72fdb36ce28b3c09eecd2d7fe493c91a1" +cd ${ROOT}/nodes && git clone https://github.com/WASasquatch/was-node-suite-comfyui && cd "$(basename "$_" .git)" && git reset --hard "b2f12387b2af5aae98d69d785709971c123a10fd" +cd ${ROOT}/nodes && git clone https://github.com/huchenlei/ComfyUI-layerdiffuse +cd ${ROOT}/nodes && git clone https://github.com/Fannovel16/comfyui_controlnet_aux +cd ${ROOT}/nodes && git clone https://github.com/aria1th/ComfyUI-LogicUtils +cd ${ROOT}/nodes && git clone https://github.com/ltdrdata/ComfyUI-Impact-Pack +cd ${ROOT}/nodes && git clone https://github.com/pythongosssss/ComfyUI-Custom-Scripts +cd ${ROOT}/nodes && git clone --recursive https://github.com/receyuki/comfyui-prompt-reader-node && cd "$(basename "$_" .git)" && git reset --hard 07a1a5314d09dad4a8445d6921914e8ea8250324 +cd ${ROOT}/nodes && git clone https://github.com/edenartlab/eden_comfy_pipelines +cd ${ROOT}/nodes && git clone https://github.com/evanspearman/ComfyMath +cd ${ROOT}/nodes && git clone https://github.com/drmbt/comfyui-dreambait-nodes diff --git a/docker/basic/start.sh b/docker/basic/start.sh deleted file mode 100755 index 446338c..0000000 --- a/docker/basic/start.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -ROOT=/comfyui-launcher - -rm -rf /etc/nginx && git clone git@github.com:stakeordie/emprops-nginx-conf.git /etc/nginx-repo && ln -s /etc/nginx-repo/node /etc/nginx -ln -s /etc/nginx-repo/node /etc/nginx - -git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT}/ComfyUI -cd ${ROOT}/ComfyUI && git reset --hard "915fdb57454c094391d830cefb4ffdd24ed8088c" && pip install -r requirements.txt -rm -rf custom_nodes -mv ${ROOT}/nodes ${ROOT}/ComfyUI/custom_nodes - -/scripts/models.sh - -pip install "numpy < 2" - -cd ${ROOT}/ComfyUI && pm2 start --name comfy "python main.py" - - -git clone https://github.com/stakeordie/comfy-middleware.git ${ROOT}/comfy-middleware -cd ${ROOT}/comfy-middleware && pm2 start --name comfy-middleware "python main.py --port 3001" - -/etc/init.d/nginx start - -/scripts/cron.sh - -sleep infinity \ No newline at end of file