More fixes

.gitea/workflows/build.yaml

@@ -6,7 +6,9 @@ on:
       - main
 
 jobs:
-  build:
+
+  # Build ComfyUI-Cuda
+  build-cuda:
     runs-on: alpine-linux
     steps:
       - name: checkout
@@ -21,20 +23,61 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: build and push comfyui
+      - name: build and push comfyui-cuda
         run: |
           docker buildx build \
           --platform=linux/arm64 \
-          -t mistox/comfyui-ampere \
-          -f comfyui-dockerfile \
+          -t mistox/comfyui-cuda-ampere:latest \
+          -f comfyui-cuda-dockerfile \
           --push \
           .
 
+  # Build ComfyUI-Rocm
+  build-rocm:
+    runs-on: alpine-linux
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: build and push comfyui-rocm
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t mistox/comfyui-rocm-ampere:latest \
+          -f comfyui-rocm-dockerfile \
+          --push \
+          .
+
+  # Job 3: Uvicorn Build
+  build-uvicorn:
+    runs-on: alpine-linux
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: build and push uvicorn
         run: |
           docker buildx build \
           --platform=linux/arm64 \
-          -t mistox/uvicorn-ampere \
+          -t mistox/uvicorn-ampere:latest \
           -f uvicorn-dockerfile \
           --push \
-          .
+          .

comfyui-cuda-dockerfile

@@ -0,0 +1,34 @@
+# Get cuda version from https://hub.docker.com/r/nvidia/cuda
+FROM nvcr.io/nvidia/pytorch:25.05-py3 AS build-deps
+
+# Install system dependencies
+RUN pip install imageio controlnet_aux
+
+# Set working directory
+WORKDIR /app
+
+# Clone ComfyUI
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
+
+# Link in python
+RUN ln -sf /usr/bin/python3 /usr/bin/python && \
+    ln -sf /usr/bin/pip3 /usr/bin/pip
+
+# Install
+RUN grep -vE "^(torch|#)" requirements.txt | xargs pip install && \
+    pip install torchsde
+
+# Set custom Nodes
+WORKDIR /app/custom_nodes
+
+# Install ComfyUi Manager
+RUN git clone https://github.com/Comfy-Org/ComfyUI-Manager.git
+
+# Go back to root
+WORKDIR /app
+
+# Expose the default ComfyUI port
+EXPOSE 8188
+
+# Launch ComfyUI
+CMD ["python3", "main.py", "--listen", "0.0.0.0"]

comfyui-dockerfile

@@ -1,32 +0,0 @@
-# Get cuda version from https://hub.docker.com/r/nvidia/cuda
-FROM nvcr.io/nvidia/pytorch:25.05-py3 AS build-deps
-
-WORKDIR /app
-
-# Get release version from https://github.com/comfyanonymous/ComfyUI/releases
-ARG ComfyUI_Release=0.3.71
-
-RUN pip install imageio controlnet_aux
-
-RUN wget https://github.com/comfyanonymous/ComfyUI/archive/refs/tags/v${ComfyUI_Release}.tar.gz && \
-    tar xzf v${ComfyUI_Release}.tar.gz && \
-    rm v${ComfyUI_Release}.tar.gz && \
-    mv /app/ComfyUI-${ComfyUI_Release} /app/comfyui/
-
-WORKDIR /app/comfyui
-
-RUN ln -sf /usr/bin/python3 /usr/bin/python && \
-    ln -sf /usr/bin/pip3 /usr/bin/pip
-
-RUN grep -vE "^(torch|#)" requirements.txt | xargs pip install && \
-    pip install torchsde
-
-WORKDIR /app/comfyui/custom_nodes
-
-RUN git clone https://github.com/Comfy-Org/ComfyUI-Manager.git
-
-WORKDIR /app/comfyui
-
-EXPOSE 8188
-
-CMD ["python", "main.py", "--listen", "0.0.0.0"]

comfyui-rocm-dockerfile

@@ -0,0 +1,40 @@
+# Use the official ROCm base image
+FROM ubuntu:26.04
+
+# Set environment variables for 7900 XTX (gfx1100)
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PYTHONUNBUFFERED=1
+
+RUN apt update -y && apt install -y --no-install-recommends \
+    rocm \
+    python3-pip \
+    python3-dev \
+    python3-torch-rocm \
+    python3-torchaudio \
+    git \
+    libgl1 \
+    libglib2.0-bin \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Clone ComfyUI
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
+
+# Create sub dependancy
+RUN grep -vE 'torch|nvidia|cuda|triton|kornia|spandrel' requirements.txt > req_no_torch.txt
+
+# Install non torch dependant requirements
+RUN pip3 install --no-cache-dir --break-system-packages -r req_no_torch.txt
+
+# Manually install the sensitive ones with --no-deps
+RUN pip3 install --no-deps --break-system-packages torchsde kornia spandrel
+
+# Setup Manager
+WORKDIR /app/custom_nodes
+RUN git clone https://github.com/Comfy-Org/ComfyUI-Manager.git
+
+WORKDIR /app
+EXPOSE 8188
+
+CMD ["python3", "main.py", "--listen", "0.0.0.0"]

cuda-docker-compose.yml

@@ -1,17 +1,21 @@
 services:
   ollama:
     container_name: ai-ollama
-    runtime: nvidia
-    pull_policy: always
-    tty: true
-    restart: unless-stopped
     image: docker.io/ollama/ollama:latest
+    pull_policy: always
+    restart: unless-stopped
+    tty: true
     volumes:
       - ./data/ollama/ollama:/root/.ollama
-    ports:
-      - 7869:11434
     environment:
       - OLLAMA_KEEP_ALIVE=24h
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
   ollama-webui:
     image: ghcr.io/open-webui/open-webui:main
@@ -23,7 +27,7 @@ services:
     ports:
       - 8009:8080
     environment: # https://docs.openwebui.com/getting-started/env-configuration#default_models
-      - OLLAMA_BASE_URLS=http://host.docker.internal:7869
+      - OLLAMA_BASE_URLS=http://ollama:11434
       - ENV=prod
       - WEBUI_AUTH=True
       - WEBUI_NAME=Mistox AI
@@ -37,8 +41,6 @@ services:
     image: docker.io/searxng/searxng:latest
     container_name: ai-searxng
     restart: always
-    ports:
-      - 8888:8080
     volumes:
       - ./data/searxng/config:/etc/searxng
       - ./data/searxng/data:/var/cache/searxng
@@ -58,14 +60,20 @@ services:
 
   comfyui:
     container_name: ai-comfyui
-    image: mistox/comfyui-ampere
-    runtime: nvidia
+    image: mistox/comfyui-cuda-ampere
     volumes:
       - ./data/comfyui/models:/app/comfyui/models
       - ./data/comfyui/output:/app/comfyui/output
     ports:
       - 8010:8188
     restart: always
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
 volumes:
-  uvicorn-src:
+  uvicorn-src:

rocm-docker-compose.yml

@@ -0,0 +1,78 @@
+services:
+  ollama:
+    container_name: ai-ollama
+    image: docker.io/ollama/ollama:latest # This is only X86_64 right now. Working on building an image for this on ROCM
+    pull_policy: always
+    restart: unless-stopped
+    tty: true
+    volumes:
+      - ./data/ollama/ollama:/root/.ollama
+    environment:
+      - OLLAMA_KEEP_ALIVE=24h
+      - HSA_OVERRIDE_GFX_VERSION=11.0.0 # This is for the RX 7900XTX
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+
+  ollama-webui:
+    container_name: ai-ollama-webui
+    image: ghcr.io/open-webui/open-webui:main
+    volumes:
+      - ./data/ollama/ollama-webui:/app/backend/data
+    depends_on:
+      - ollama
+    ports:
+      - 8009:8080
+    environment: # https://docs.openwebui.com/getting-started/env-configuration#default_models
+      - OLLAMA_BASE_URLS=http://ollama:11434
+      - ENV=prod
+      - WEBUI_AUTH=True
+      - WEBUI_NAME=Mistox AI
+      - WEBUI_URL=http://ai.mistox.net:8080
+      - WEBUI_SECRET_KEY=aops8gh948g@#50dfg00f
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    restart: unless-stopped
+
+  searxng:
+    container_name: ai-searxng
+    image: docker.io/searxng/searxng:latest
+    restart: always
+    ports:
+      - 8888:8080
+    volumes:
+      - ./data/searxng/config:/etc/searxng
+      - ./data/searxng/data:/var/cache/searxng
+
+  ai-uvicorn:
+    container_name: ai-uvicorn
+    image: mistox/uvicorn-ampere
+    ports:
+      - 8000:8000
+      - 5678:5678
+    volumes:
+      - uvicorn-src:/code/ollama-docker
+    restart: always
+    depends_on:
+      - ollama
+      - ollama-webui
+
+  comfyui:
+    container_name: ai-comfyui
+    image: mistox/comfyui-rocm-ampere
+    restart: unless-stopped
+    pull_policy: always
+    ports:
+      - 8010:8188
+    environment:
+      - HSA_OVERRIDE_GFX_VERSION=11.0.0 # This is for the RX 7900XTX
+    devices:
+      - /dev/kfd:/dev/kfd
+      - /dev/dri:/dev/dri
+    volumes:
+      - ./data/comfyui/models:/home/user/comfyui/models
+      - ./data/comfyui/output:/home/user/comfyui/output
+      - ./data/comfyui/custom_nodes:/home/user/comfyui/custom_nodes
+
+volumes:
+  uvicorn-src: