From 7d41df6976703a2b676b2dc5ffa4795e1e1304cc Mon Sep 17 00:00:00 2001 From: "Christoph J. Scherr" Date: Fri, 28 Feb 2025 16:14:23 +0100 Subject: [PATCH] fix: containerized senju did not start properly Refs: OPS-10 --- Dockerfile | 6 +++--- docker-compose.yml | 11 ++++++----- entrypoint.sh | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2dba618..27fe7e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM python:3.12-alpine AS base -# VENV not needed in docker container -ENV POETRY_VIRTUALENVS_CREATE=false +ENV POETRY_VIRTUALENVS_CREATE=true +ENV FLASK_APP=senju/main.py COPY ./entrypoint.sh / WORKDIR /app -COPY . . +COPY . . # Install dependencies RUN apk add curl diff --git a/docker-compose.yml b/docker-compose.yml index a93d2f1..15fa1cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,17 +6,18 @@ services: ports: - "127.0.0.1:5000:5000" volumes: - - ./senju:/app + - ./senju:/app/senju depends_on: - ollama - + ollama: - image: docker.io/ollama/ollama + image: docker.io/ollama/ollama volumes: - - ./ollama:/root/.ollama + - ollama:/root/.ollama container_name: ollama environment: - OLLAMA_KEEP_ALIVE=24h - OLLAMA_HOST=0.0.0.0 - +volumes: + ollama: diff --git a/entrypoint.sh b/entrypoint.sh index ea3ed14..ad9e08d 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,5 +2,5 @@ curl http://ollama:11434/api/pull -d '{"model": "llama3.2:1b"}' -flask --app senju/main run --debug --host=0.0.0.0 - +cd /app +poetry run sh -c 'flask --app senju/main run --host=0.0.0.0'