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
@@ -25,25 +27,57 @@ jobs:
         run: |
           docker buildx build \
           --platform=linux/arm64 \
-          -t mistox/comfyui-cuda-ampere \
+          -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 \
+          -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-rocm-dockerfile

@@ -1,44 +1,40 @@
 # Use the official ROCm base image
-FROM rocm/dev-ubuntu-24.04:6.2
+FROM ubuntu:26.04
 
 # Set environment variables for 7900 XTX (gfx1100)
-ENV HSA_OVERRIDE_GFX_VERSION=11.0.0
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
-ENV TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL=1
 ENV PYTHONUNBUFFERED=1
 
-# Install system dependencies
+RUN apt update -y && apt install -y --no-install-recommends \
-RUN apt-get update && apt-get install -y \
+    rocm \
     python3-pip \
-    python3-venv \
+    python3-dev \
+    python3-torch-rocm \
+    python3-torchaudio \
     git \
-    libgl1-mesa-glx \
+    libgl1 \
-    libglib2.0-0 \
+    libglib2.0-bin \
     && rm -rf /var/lib/apt/lists/*
 
-# Set working directory
 WORKDIR /app
 
 # Clone ComfyUI
 RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
 
-# Install PyTorch with ROCm 6.2 support (matching the base image)
+# Create sub dependancy
-RUN pip3 install --no-cache-dir torch torchvision torchaudio \
+RUN grep -vE 'torch|nvidia|cuda|triton|kornia|spandrel' requirements.txt > req_no_torch.txt
-    --index-url https://download.pytorch.org/whl/rocm6.2
 
-# Install ComfyUI dependencies
+# Install non torch dependant requirements
-RUN pip3 install --no-cache-dir -r requirements.txt
+RUN pip3 install --no-cache-dir --break-system-packages -r req_no_torch.txt
 
-# Set custom Nodes
+# 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
-
-# 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"]
-CMD ["python3", "main.py", "--listen", "0.0.0.0"]

cuda-docker-compose.yml

@@ -1,14 +1,12 @@
 services:
   ollama:
     container_name: ai-ollama
-    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:
@@ -29,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

rocm-docker-compose.yml

@@ -2,19 +2,17 @@ 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
-    restart: unless-stopped
     pull_policy: always
+    restart: unless-stopped
     tty: true
     volumes:
       - ./data/ollama/ollama:/root/.ollama
-    ports:
-      - 7869:11434
     environment:
       - OLLAMA_KEEP_ALIVE=24h
       - HSA_OVERRIDE_GFX_VERSION=11.0.0 # This is for the RX 7900XTX
     devices:
-      - /dev/kfd:/dev/kfd # Shared surface driver for ROCm
+      - /dev/kfd:/dev/kfd
-      - /dev/dri:/dev/dri # Direct Rendering Infrastructure for GPU access
+      - /dev/dri:/dev/dri
 
   ollama-webui:
     container_name: ai-ollama-webui
@@ -26,7 +24,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