diff --git a/apps/sd-webui-comfy/README.md b/apps/sd-comfyui/README.md similarity index 100% rename from apps/sd-webui-comfy/README.md rename to apps/sd-comfyui/README.md diff --git a/apps/sd-comfyui/data.yml b/apps/sd-comfyui/data.yml new file mode 100644 index 00000000..dceb81ce --- /dev/null +++ b/apps/sd-comfyui/data.yml @@ -0,0 +1,20 @@ +name: Stable Diffusion ComfyUI +tags: + - 工具 +title: 最强大、模块化的 stable diffusion GUI,具有图形/节点界面 +type: 工具 +description: 最强大、模块化的 stable diffusion GUI,具有图形/节点界面 +additionalProperties: + key: sd-comfyui + name: Stable Diffusion ComfyUI + tags: + - Tool + shortDescZh: 最强大、模块化的 stable diffusion GUI,具有图形/节点界面 + shortDescEn: The most powerful and modular stable diffusion GUI with a graph/nodes interface + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://github.com/thirdscam/SD-WebUI-Docker + github: https://github.com/thirdscam/SD-WebUI-Docker + document: https://github.com/thirdscam/SD-WebUI-Docker diff --git a/apps/sd-webui-comfy/sd-webui-comfy/comfy/Dockerfile b/apps/sd-comfyui/latest/comfy/Dockerfile similarity index 100% rename from apps/sd-webui-comfy/sd-webui-comfy/comfy/Dockerfile rename to apps/sd-comfyui/latest/comfy/Dockerfile diff --git a/apps/sd-webui-comfy/sd-webui-comfy/comfy/entrypoint.sh b/apps/sd-comfyui/latest/comfy/entrypoint.sh similarity index 100% rename from apps/sd-webui-comfy/sd-webui-comfy/comfy/entrypoint.sh rename to apps/sd-comfyui/latest/comfy/entrypoint.sh diff --git a/apps/sd-comfyui/latest/data.yml b/apps/sd-comfyui/latest/data.yml new file mode 100644 index 00000000..e9ee33af --- /dev/null +++ b/apps/sd-comfyui/latest/data.yml @@ -0,0 +1,52 @@ +additionalProperties: + formFields: + - default: 40187 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: '--listen 0.0.0.0 --port 8188' + edit: true + envKey: SD_CONSOLE_CLI_COMFY + labelEn: CLI ARGS for ComfyUI + labelZh: ComfyUI 的 CLI_ARGS 参数 + required: true + type: text + - default: "" + edit: true + envKey: SD_CONSOLE_APT_COMFY + labelEn: Install some package if you want (equivalent to apt-get install -y) + labelZh: 想安装的软件包 (等同 apt-get install -y) + required: false + type: text + - default: "" + edit: true + envKey: SD_CONSOLE_PIP_COMFY + labelEn: Install pip package if you want (equivalent to pip install) + labelZh: 想安装的 pip 包 (等同 pip install) + required: false + type: text + #- default: 0 + # edit: true + # envKey: SD_CONSOLE_DEVICE_IDS + # labelEn: GPU ID + # labelZh: SD 运行指定的 GPU 设备 ID + # required: true + # type: number + - default: ./data/data + edit: true + envKey: DATA_PATH + labelEn: Data storage folder + labelZh: 数据存放文件夹 + required: true + type: text + - default: ./data/output + edit: true + envKey: OUTPUT_PATH + labelEn: Picture output folder + labelZh: 图片输出文件夹 + required: true + type: text diff --git a/apps/sd-comfyui/latest/docker-compose.yml b/apps/sd-comfyui/latest/docker-compose.yml new file mode 100644 index 00000000..e9eeadb6 --- /dev/null +++ b/apps/sd-comfyui/latest/docker-compose.yml @@ -0,0 +1,34 @@ +version: '3' +services: + sd-comfyui: + build: ./comfy + image: sd-comfyui:latest + container_name: ${CONTAINER_NAME} + restart: always + runtime: nvidia + networks: + - 1panel-network + ports: + - "${PANEL_APP_PORT_HTTP}:8188" + volumes: + - ${DATA_PATH}:/data + - ${OUTPUT_PATH}:/output + environment: + - CLI_ARGS=${SD_CONSOLE_CLI_COMFY} + - APT_ARGS=${SD_CONSOLE_APT_COMFY} + - PIP_ARGS=${SD_CONSOLE_PIP_COMFY} + - NVIDIA_DRIVER_CAPABILITIES=compute,utility + - NVIDIA_VISIBLE_DEVICES=all + # 1Panel会覆盖此设置 + #deploy: + # resources: + # reservations: + # devices: + # - driver: nvidia + # device_ids: ['${SD_CONSOLE_DEVICE_IDS}'] + # capabilities: [gpu,compute,utility] + labels: + createdBy: Apps +networks: + 1panel-network: + external: true diff --git a/apps/sd-comfyui/latest/env.sample b/apps/sd-comfyui/latest/env.sample new file mode 100644 index 00000000..3e9125da --- /dev/null +++ b/apps/sd-comfyui/latest/env.sample @@ -0,0 +1,8 @@ +CONTAINER_NAME="sd-comfyui" +PANEL_APP_PORT_HTTP="40187" +DATA_PATH="./data/data" +OUTPUT_PATH="./data/output" +SD_CONSOLE_CLI_COMFY="--listen 0.0.0.0 --port 8188" +SD_CONSOLE_APT_COMFY="" +SD_CONSOLE_PIP_COMFY="" +SD_CONSOLE_DEVICE_IDS="0" diff --git a/apps/sd-webui-comfy/sd-webui-comfy/scripts/init.sh b/apps/sd-comfyui/latest/scripts/init.sh similarity index 100% rename from apps/sd-webui-comfy/sd-webui-comfy/scripts/init.sh rename to apps/sd-comfyui/latest/scripts/init.sh diff --git a/apps/sd-webui-comfy/sd-webui-comfy/scripts/update.sh b/apps/sd-comfyui/latest/scripts/update.sh similarity index 100% rename from apps/sd-webui-comfy/sd-webui-comfy/scripts/update.sh rename to apps/sd-comfyui/latest/scripts/update.sh diff --git a/apps/sd-comfyui/logo.png b/apps/sd-comfyui/logo.png new file mode 100644 index 00000000..9cec3e62 Binary files /dev/null and b/apps/sd-comfyui/logo.png differ diff --git a/apps/sd-webui-comfy/data.yml b/apps/sd-webui-comfy/data.yml deleted file mode 100644 index a2ec101e..00000000 --- a/apps/sd-webui-comfy/data.yml +++ /dev/null @@ -1,13 +0,0 @@ -additionalProperties: #固定参数 - key: sd-webui-comfy #应用的 key ,仅限英文,用于在 Linux 创建文件夹 - name: sd-webui-comfy #应用名称 - tags: - - Local #应用标签,可以有多个,请参照下方的标签列表 - shortDescZh: comfy版sd-web #应用中文描述,不要超过30个字 - shortDescEn: stable-diffusion-webui-comfy #应用英文描述 - type: Local #应用类型,区别于应用分类,只能有一个,请参照下方的类型列表 - crossVersionUpdate: true #是否可以跨大版本升级 - limit: 0 #应用安装数量限制,0 代表无限制 - website: https://github.com/thirdscam/SD-WebUI-Docker #官网地址 - github: https://github.com/thirdscam/SD-WebUI-Docker #github 地址 - document: https://github.com/thirdscam/SD-WebUI-Docker #文档地址 diff --git a/apps/sd-webui-comfy/logo.png b/apps/sd-webui-comfy/logo.png deleted file mode 100644 index 65524863..00000000 Binary files a/apps/sd-webui-comfy/logo.png and /dev/null differ diff --git a/apps/sd-webui-comfy/sd-webui-comfy/data.yml b/apps/sd-webui-comfy/sd-webui-comfy/data.yml deleted file mode 100644 index 2a9fd10c..00000000 --- a/apps/sd-webui-comfy/sd-webui-comfy/data.yml +++ /dev/null @@ -1,46 +0,0 @@ -additionalProperties: - formFields: - - default: http://localhost:7890 - edit: true - envKey: SD_CONSOLE_URL - labelEn: External URL - labelZh: 外部访问地址 - required: true - rule: paramExtUrl - type: text - - default: 7890 - edit: true - envKey: SD_CONSOLE_PORT - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number - - default: --listen --port 7890 - edit: true - envKey: SD_CONSOLE_CLI_COMFY - labelEn: CLI_ARGS_for_Comfy - labelZh: COMFY的CLI_ARGS参数 - required: true - type: text - - default: "" - edit: true - envKey: SD_CONSOLE_APT_COMFY - labelEn: APT_For_COMFY - labelZh: COMFY的APT参数 - required: false - type: text - - default: "" - edit: true - envKey: SD_CONSOLE_PIP_COMFY - labelEn: PIP_For_COMFY - labelZh: COMFY的PIP参数 - required: false - type: text - - default: 0 - edit: true - envKey: SD_CONSOLE_DEVICE_IDS - labelEn: SD_CONSOLE_GPU_DEVICE_IDS - labelZh: SD运行指定的GPU设备ID - required: true - type: number diff --git a/apps/sd-webui-comfy/sd-webui-comfy/docker-compose.yml b/apps/sd-webui-comfy/sd-webui-comfy/docker-compose.yml deleted file mode 100644 index 3f0d8016..00000000 --- a/apps/sd-webui-comfy/sd-webui-comfy/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: '3.9' -services: - a1111: - container_name: ${CONTAINER_NAME} - build: ./comfy - ports: - - "${SD_CONSOLE_PORT}:7890" - volumes: - - ./data:/data - - ./output:/output - stop_signal: SIGINT - environment: - # CLI_ARGS: Command Line Arguments. - # https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Command-Line-Arguments-and-Settings - # If you want, you can add other Command Line Arguments by referring to the link above. - - # By default, it runs through `--opt-sdp-no-mem-attention` without using xformers. - # If you want, you can run it through xformers by deleting `--opt-sdp-no-mem-attention` and inserting `--xformers`. - - CLI_ARGS=${SD_CONSOLE_CLI_COMFY} - #--listen --port 7890 --enable-insecure-extension-access --api --theme=dark --no-half-vae --opt-sdp-no-mem-attention - - # APT_ARGS, PIP_ARGS: This is where you write the apt and pip packages to install. - # Install some package if you want. - - APT_ARGS=${SD_CONSOLE_APT_COMFY} - # ex) APT_ARGS=package1 package2 ... - # equals apt-get install -y package1 package2 ... - - PIP_ARGS=${SD_CONSOLE_PIP_COMFY} - # ex) PIP_ARGS=package1 package2 ... - # equals pip install package1 package2 ... - - # Tip: If you want to do "pip install -U SomePackage", you can do "-U SomePackage" on the PIP_ARGS. - # Like This: PIP_ARGS=-U SomePackage - # Same at "--user SomePackage" - # PIP_ARGS=--user SomePackage - deploy: - resources: - reservations: - devices: - - driver: nvidia - device_ids: ['${SD_CONSOLE_DEVICE_IDS}'] - capabilities: [gpu,compute,utility]