From d6ca5ab72587f1ffd92e7d7b2b033be387cb4f5b Mon Sep 17 00:00:00 2001
From: RemiZOffAlex <remizoffalex@gmail.com>
Date: Sun, 30 Mar 2025 02:14:35 +0300
Subject: [PATCH] Split

---
 Dockerfile       | 11 +++++++++--
 docker.sh        | 13 +++++++++++++
 minio.sh         |  7 +++++++
 pre.sh           | 21 ---------------------
 requirements.txt | 25 +++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100755 docker.sh
 create mode 100755 minio.sh
 create mode 100644 requirements.txt

diff --git a/Dockerfile b/Dockerfile
index 7789cc9..0ab9233 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,18 @@
 FROM fedora:41 AS basic
 
-WORKDIR /build
+WORKDIR /workbench
 
-COPY pre.sh /root/
+COPY pre.sh requirements.txt docker.sh minio.sh /root/
 
 RUN /root/pre.sh
 
+RUN /root/docker.sh
+
+RUN /root/minio.sh
+
+# Python packages
+RUN pip3 install -r /root/requirements.txt
+
 # FROM basic
 
 # WORKDIR /app
diff --git a/docker.sh b/docker.sh
new file mode 100755
index 0000000..de23e21
--- /dev/null
+++ b/docker.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# Docker
+dnf -y install dnf-plugins-core
+dnf5 config-manager \
+    addrepo \
+    --from-repofile \
+    https://download.docker.com/linux/fedora/docker-ce.repo
+dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+dnf -y clean all
diff --git a/minio.sh b/minio.sh
new file mode 100755
index 0000000..c2b87b6
--- /dev/null
+++ b/minio.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+# Minio
+wget -O /usr/local/bin/minio-client https://dl.min.io/client/mc/release/linux-amd64/mc
+chmod +x /usr/local/bin/minio-client
diff --git a/pre.sh b/pre.sh
index cbd6a1f..78ee703 100755
--- a/pre.sh
+++ b/pre.sh
@@ -14,25 +14,4 @@ dnf -y group install standard core \
 hardware-support development-libs development-tools
 dnf -y install postgresql-server-devel
 
-# Python packages
-pip3 install \
-ansible pyinfra fabric \
-build \
-flask gunicorn aiohttp \
-buildbot buildbot-www buildbot-worker \
-buildbot-waterfall-view buildbot-console-view buildbot-grid-view \
-service_identity alembic
-
-# Docker
-dnf -y install dnf-plugins-core
-dnf5 config-manager \
-    addrepo \
-    --from-repofile \
-    https://download.docker.com/linux/fedora/docker-ce.repo
-dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-
-# Minio
-wget -O /usr/local/bin/minio-client https://dl.min.io/client/mc/release/linux-amd64/mc
-chmod +x /usr/local/bin/minio-client
-
 dnf -y clean all
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..03324da
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,25 @@
+ansible
+pyinfra
+fabric
+build
+flask
+gunicorn
+aiohttp
+
+lxml
+lxml_html_clean
+markdown
+
+buildbot
+buildbot-www
+buildbot-worker
+buildbot-waterfall-view
+buildbot-console-view
+buildbot-grid-view
+service_identity
+
+sqlalchemy
+sqlalchemy_utils
+alembic
+
+jsonrpc@git+https://codex.r10x.net/RemiZOffAlex/jsonrpc