Update

services/comfy/Dockerfile

@@ -1,22 +1,69 @@
-FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
+# Defines the versions of ComfyUI, ComfyUI Manager, and PyTorch to use
+ARG COMFYUI_VERSION=v0.3.43
+ARG COMFYUI_MANAGER_VERSION=3.33.3
+ARG PYTORCH_VERSION=2.7.1-cuda12.8-cudnn9-runtime
+
+# This image is based on the latest official PyTorch image, because it already contains CUDA, CuDNN, and PyTorch
+FROM pytorch/pytorch:${PYTORCH_VERSION}
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
-RUN apt-get update && apt-get install -y git && apt-get clean
+RUN apt update --assume-yes && \
+    apt install --assume-yes \
+        git \
+        sudo \
+        build-essential \
+        libgl1-mesa-glx \
+        libglib2.0-0 \
+        libsm6 \
+        libxext6 \
+        ffmpeg && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-ENV ROOT=/stable-diffusion
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
-  cd ${ROOT} && \
-  git checkout master && \
-  git reset --hard 276f8fce9f5a80b500947fb5745a4dde9e84622d && \
-  pip install -r requirements.txt
+# Clones the ComfyUI repository and checks out the latest release
+RUN git clone --depth=1 https://github.com/comfyanonymous/ComfyUI.git /opt/comfyui && \
+    cd /opt/comfyui && \
+    git fetch origin ${COMFYUI_VERSION} && \
+    git checkout FETCH_HEAD
 
-WORKDIR ${ROOT}
+# Clones the ComfyUI Manager repository and checks out the latest release; ComfyUI Manager is an extension for ComfyUI that enables users to install
+# custom nodes and download models directly from the ComfyUI interface; instead of installing it to "/opt/comfyui/custom_nodes/ComfyUI-Manager", which
+# is the directory it is meant to be installed in, it is installed to its own directory; the entrypoint will symlink the directory to the correct
+# location upon startup; the reason for this is that the ComfyUI Manager must be installed in the same directory that it installs custom nodes to, but
+# this directory is mounted as a volume, so that the custom nodes are not installed inside of the container and are not lost when the container is
+# removed; this way, the custom nodes are installed on the host machine
+RUN git clone --depth=1 https://github.com/Comfy-Org/ComfyUI-Manager.git /opt/comfyui-manager && \
+    cd /opt/comfyui-manager && \
+    git fetch origin ${COMFYUI_MANAGER_VERSION} && \
+    git checkout FETCH_HEAD
+
+# Installs the required Python packages for both ComfyUI and the ComfyUI Manager
+RUN pip install \
+    --requirement /opt/comfyui/requirements.txt \
+    --requirement /opt/comfyui-manager/requirements.txt
+
+RUN pip3 install --no-cache-dir \
+    opencv-python \
+    diffusers \
+    triton \
+    sageattention \
+    psutil
+
+# Sets the working directory to the ComfyUI directory
+WORKDIR /opt/comfyui
 COPY . /docker/
-RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
+RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml /opt/comfyui
 
 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}
+EXPOSE 7861
+
+# Adds the startup script to the container; the startup script will create all necessary directories in the models and custom nodes volumes that were
+# mounted to the container and symlink the ComfyUI Manager to the correct directory; it will also create a user with the same UID and GID as the user
+# that started the container, so that the files created by the container are owned by the user that started the container and not the root user
+ENTRYPOINT ["/bin/bash", "/docker/entrypoint.sh"]
+
+# On startup, ComfyUI is started at its default port; the IP address is changed from localhost to 0.0.0.0, because Docker is only forwarding traffic
+# to the IP address it assigns to the container, which is unknown at build time; listening to 0.0.0.0 means that ComfyUI listens to all incoming
+# traffic; the auto-launch feature is disabled, because we do not want (nor is it possible) to open a browser window in a Docker container
+CMD ["/opt/conda/bin/python", "main.py", "--listen", "0.0.0.0", "--port", "7861", "--disable-auto-launch"]