GiteaAdmin/go-lcg
1
0
Fork 0
mirror of https://github.com/Direct-Dev-Ru/go-lcg.git synced 2025-11-16 01:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Кузнецов Антон (aka Direct-dev.ru)
2025-11-09 19:10:54 +06:00
parent 7b7142a5c3
commit c83fed5591
10 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfiles/OllamaServer/Dockerfile
View File

@@ -1,6 +1,10 @@
# Используем готовый образ Ollama
FROM localhost/ollama_packed:latest
RUN apt-get update && apt-get install -y --no-install-recommends bash && apt-get install -y --no-install-recommends curl \
&& apt-get install -y --no-install-recommends jq && apt-get install -y --no-install-recommends wget
# Устанавливаем bash если его нет (базовый образ ollama может быть на разных дистрибутивах)
RUN if ! command -v bash >/dev/null 2>&1; then \
if command -v apk >/dev/null 2>&1; then \
@@ -72,6 +76,8 @@ ENV LCG_SERVER_HOST=0.0.0.0
ENV LCG_SERVER_PORT=8080
ENV LCG_DOMAIN="remote.ollama-server.ru"
ENV LCG_COOKIE_PATH="/lcg"
# ENV LCG_FORCE_NO_CSRF=true
# ENV LCG_SERVER_ALLOW_HTTP=true
# ENV OLLAMA_HOST=127.0.0.1
# ENV OLLAMA_PORT=11434

6
Dockerfiles/OllamaServer/Makefile
View File

@@ -52,7 +52,7 @@ run: ## Запустить контейнер (Docker)
-v lcg-results:/app/data/results \
-v lcg-prompts:/app/data/prompts \
-v lcg-config:/app/data/config \
${IMAGE_NAME}:${IMAGE_TAG}
${IMAGE_NAME}:${IMAGE_TAG} ollama serve
@echo "Контейнер ${CONTAINER_NAME} запущен"
run-podman: ## Запустить контейнер (Podman)
@@ -69,7 +69,7 @@ run-podman: ## Запустить контейнер (Podman)
-v lcg-results:/app/data/results \
-v lcg-prompts:/app/data/prompts \
-v lcg-config:/app/data/config \
${IMAGE_NAME}:${IMAGE_TAG}
${IMAGE_NAME}:${IMAGE_TAG} ollama serve
@echo "Контейнер ${CONTAINER_NAME} запущен"
run-podman-nodemon: ## Запустить контейнер (Podman) без -d
@@ -86,7 +86,7 @@ run-podman-nodemon: ## Запустить контейнер (Podman) без -d
-v lcg-results:/app/data/results \
-v lcg-prompts:/app/data/prompts \
-v lcg-config:/app/data/config \
${IMAGE_NAME}:${IMAGE_TAG}
${IMAGE_NAME}:${IMAGE_TAG} ollama serve
@echo "Контейнер ${CONTAINER_NAME} запущен"
stop: ## Остановить контейнер (Docker)

3
Dockerfiles/OllamaServer/entrypoint.sh
View File

@@ -65,7 +65,8 @@ export LCG_CONFIG_FOLDER="${LCG_CONFIG_FOLDER:-/app/data/config}"
export LCG_SERVER_HOST="${LCG_SERVER_HOST:-0.0.0.0}"
export LCG_SERVER_PORT="${LCG_SERVER_PORT:-8080}"
export LCG_SERVER_ALLOW_HTTP="${LCG_SERVER_ALLOW_HTTP:-false}"
export LCG_FORCE_NO_CSRF="${LCG_FORCE_NO_CSRF:-true}"
export LCG_FORCE_NO_CSRF="${LCG_FORCE_NO_CSRF:-false}"
export LCG_CSRF_DEBUG_FILE="${LCG_CSRF_DEBUG_FILE:-/app/data/csrf-debug.log}"
if [ "$LCG_FORCE_NO_CSRF" = "true" ]; then
info "CSRF проверка отключена через LCG_FORCE_NO_CSRF"