From 5b72997888134366e59f4cca347a67fc441da524 Mon Sep 17 00:00:00 2001 From: "MH.Dmitrii" Date: Sat, 28 Feb 2026 15:46:59 +0300 Subject: [PATCH] feature dockerfile fix 0.0023 --- docker/dockerfile | 11 ++++++++ docker/gitea_runner_image/dockerfile.runner | 29 +++++---------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index d538e2e..2320538 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -1,6 +1,17 @@ FROM python:3.15.0a6-slim WORKDIR /home/backend COPY ../server /home/backend +RUN apt-get update && apt-get install -y \ + # curl \ + # gnupg \ + # git \ + # build-essential \ + # libffi-dev \ + # libssl-dev \ + cargo \ + g++ \ + && rm -rf /var/lib/apt/lists/* + RUN python -m pip install --upgrade pip \ && python -m pip install -r requirements.txt RUN chmod +x ./docker/start.sh diff --git a/docker/gitea_runner_image/dockerfile.runner b/docker/gitea_runner_image/dockerfile.runner index 3c451ae..546d8c2 100644 --- a/docker/gitea_runner_image/dockerfile.runner +++ b/docker/gitea_runner_image/dockerfile.runner @@ -1,35 +1,18 @@ -FROM python:3.11-slim +# Dockerfile.runner +FROM node:20-bullseye -# Устанавливаем системные зависимости +# Устанавливаем зависимости RUN apt-get update && apt-get install -y \ - build-essential \ - g++ \ - git \ curl \ - ca-certificates \ lsb-release \ - libffi-dev \ - libssl-dev \ - cargo \ && rm -rf /var/lib/apt/lists/* -# Устанавливаем Node.js 20 -RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y nodejs \ - && npm -v && node -v - -# Устанавливаем Docker CLI +# Добавляем репозиторий Docker RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \ > /etc/apt/sources.list.d/docker.list \ && apt-get update \ && apt-get install -y docker-ce-cli docker-compose-plugin -# Обновляем pip и setuptools -RUN python3 -m pip install --upgrade pip wheel setuptools maturin setuptools-rust - -# Копируем проект -COPY ../server /home/backend - -# Устанавливаем Python зависимости -RUN python3 -m pip install -r /home/backend/requirements.txt \ No newline at end of file +# Проверка версий +RUN node -v && npm -v && docker -v && docker compose version \ No newline at end of file