From fa108190737699b37f798443f6f19218624169cb Mon Sep 17 00:00:00 2001 From: Norvicdev <101652762+Norvicdev@users.noreply.github.com> Date: Tue, 4 Aug 2026 22:08:17 +0300 Subject: [PATCH] test runner - fix v7 --- .forgejo/workflows/deploy.yml | 9 +++++++++ Dockerfile | 17 ++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 70b1d28..6e5c2e7 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -71,6 +71,15 @@ jobs: git clone https://vicsergeev.ru/forgejo/Vic/DummyApp.git . git checkout ${{ github.sha }} + - name: Install Docker CLI + run: | + apt-get update + apt-get install -y ca-certificates curl + curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz -o docker.tgz + tar xzf docker.tgz --strip-components=1 -C /usr/bin docker/docker + rm docker.tgz + docker --version + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/Dockerfile b/Dockerfile index 862816e..923d23d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,23 @@ # Многоступенчатая сборка для оптимизации -FROM python:3.14-slim as builder +FROM python:3.12-slim as builder WORKDIR /app +# Устанавливаем системные зависимости (если нужны для сборки) +RUN apt-get update && apt-get install -y --no-install-recommends gcc && rm -rf /var/lib/apt/lists/* + # Устанавливаем зависимости COPY requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir --user -r requirements.txt # Финальный образ -FROM python:3.14-slim +FROM python:3.12-slim WORKDIR /app # Копируем зависимости из builder -COPY --from=builder /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages -COPY --from=builder /usr/local/bin /usr/local/bin +COPY --from=builder /root/.local /root/.local +ENV PATH=/root/.local/bin:$PATH # Копируем код приложения COPY . . @@ -26,9 +29,9 @@ USER appuser # Экспортируем порт EXPOSE 5000 -# Health check +# Health check (requests должен быть в requirements.txt!) HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \ - CMD python -c "import requests; requests.get('http://localhost:5000/health')" || exit 1 + CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:5000/health')" || exit 1 # Запускаем через gunicorn CMD ["gunicorn", "--bind", "0.0.0.0:5000", "--workers", "4", "run:app"] \ No newline at end of file