Merge the 2 ai repos into 1

.gitea/workflows/build.yaml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -26,5 +26,15 @@ jobs:
           docker buildx build \
           --platform=linux/arm64 \
           -t mistox/comfyui-ampere \
+          -f comfyui-dockerfile \
           --push \
-          .
+          .
+
+      - name: build and push uvicorn
+        run: |
+          docker buildx build \
+          --platform=linux/arm64 \
+          -t mistox/uvicorn-ampere \
+          -f uvicorn-dockerfile \
+          --push \
+          .

README.md

@@ -1,5 +1,5 @@
-Pulls and compiles comfyUI -> fully arm64 compatable  
+This repository is to auto compile and publish to docker-hub  
-Uses docker compose for deploy  
+There are custom dockerfiles in here that can be used to pull and compile different versions of the non-compatable applications  
+In order to use this repos please just copy the docker-compose  
   
-Simply change ComfyUI version in the dockerfile  
+ONLY TESTED WITH AMPERE ALTRA USING RTX40 SERIES  
-then run docker compose up --build  

docker-compose.yml

@@ -0,0 +1,83 @@
+services:
+  ollama:
+    volumes:
+      - ./data/ollama/ollama:/root/.ollama
+    container_name: ai-ollama
+    pull_policy: always
+    tty: true
+    restart: unless-stopped
+    image: docker.io/ollama/ollama:latest
+    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
+    container_name: ai-ollama-webui
+    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://host.docker.internal:7869
+      - 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:
+    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
+
+  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-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-dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.11-slim
+
+WORKDIR /code
+
+RUN apt-get update && apt-get install git -y && apt-get install curl -y
+
+RUN git clone https://github.com/mythrantic/ollama-docker.git
+
+WORKDIR /code/ollama-docker
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+EXPOSE 8000
+
+CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]