diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0984a64..a326e3e 100644 --- a/.gitea/workflows/build.yaml +++ b/.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 \ - . \ No newline at end of file + . + + - name: build and push uvicorn + run: | + docker buildx build \ + --platform=linux/arm64 \ + -t mistox/uvicorn-ampere \ + -f uvicorn-dockerfile \ + --push \ + . diff --git a/README.md b/README.md index bdda4c1..dc98cfb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Pulls and compiles comfyUI -> fully arm64 compatable -Uses docker compose for deploy +This repository is to auto compile and publish to docker-hub +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 -then run docker compose up --build \ No newline at end of file +ONLY TESTED WITH AMPERE ALTRA USING RTX40 SERIES diff --git a/dockerfile b/comfyui-dockerfile similarity index 100% rename from dockerfile rename to comfyui-dockerfile diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6a82fbc --- /dev/null +++ b/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: diff --git a/uvicorn-dockerfile b/uvicorn-dockerfile new file mode 100644 index 0000000..5f06606 --- /dev/null +++ b/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"]