Исправления в ветке main

This commit is contained in:
2025-11-09 13:29:11 +06:00
parent c975e00c50
commit 487f3d484c
8 changed files with 36 additions and 23 deletions

View File

@@ -46,27 +46,31 @@ build-all-podman: build-binaries build-podman ## Собрать бинарник
run: ## Запустить контейнер (Docker)
docker run -d \
--name $(CONTAINER_NAME) \
-p 8080:8080 \
-p 11434:11434 \
--name ${CONTAINER_NAME} \
-p 8989:8080 \
-v ollama-data:/home/ollama/.ollama \
-v lcg-results:/app/data/results \
-v lcg-prompts:/app/data/prompts \
-v lcg-config:/app/data/config \
$(IMAGE_NAME):$(IMAGE_TAG)
@echo "Контейнер $(CONTAINER_NAME) запущен"
${IMAGE_NAME}:${IMAGE_TAG}
@echo "Контейнер ${CONTAINER_NAME} запущен"
run-podman: ## Запустить контейнер (Podman)
echo "Запустить контейнер ${CONTAINER_NAME}"
echo "IMAGE_NAME: ${IMAGE_NAME}"
echo "IMAGE_TAG: ${IMAGE_TAG}"
echo "CONTAINER_NAME: ${CONTAINER_NAME}"
podman run -d \
--name $(CONTAINER_NAME) \
-p 8080:8080 \
-p 11434:11434 \
--name ${CONTAINER_NAME} \
--restart always \
-p 8989:8080 \
-v ollama-data:/home/ollama/.ollama \
-v lcg-results:/app/data/results \
-v lcg-prompts:/app/data/prompts \
-v lcg-config:/app/data/config \
$(IMAGE_NAME):$(IMAGE_TAG)
@echo "Контейнер $(CONTAINER_NAME) запущен"
${IMAGE_NAME}:${IMAGE_TAG}
@echo "Контейнер ${CONTAINER_NAME} запущен"
stop: ## Остановить контейнер (Docker)
docker stop $(CONTAINER_NAME) || true

View File

@@ -51,13 +51,13 @@ mkdir -p "${LCG_PROMPT_FOLDER:-/app/data/prompts}"
mkdir -p "${LCG_CONFIG_FOLDER:-/app/data/config}"
# Настройка переменных окружения для Ollama
export OLLAMA_HOST="${OLLAMA_HOST:-127.0.0.1}"
export OLLAMA_HOST="${OLLAMA_HOST:-0.0.0.0}"
export OLLAMA_PORT="${OLLAMA_PORT:-11434}"
export OLLAMA_ORIGINS="*"
# Настройка переменных окружения для LCG
export LCG_PROVIDER="${LCG_PROVIDER:-ollama}"
export LCG_HOST="${LCG_HOST:-http://127.0.0.1:11434/}"
export LCG_HOST="${LCG_HOST:-http://0.0.0.0:11434/}"
export LCG_MODEL="${LCG_MODEL:-qwen2.5-coder:1.5b}"
export LCG_RESULT_FOLDER="${LCG_RESULT_FOLDER:-/app/data/results}"
export LCG_PROMPT_FOLDER="${LCG_PROMPT_FOLDER:-/app/data/prompts}"