Оптимизация Dockerfile: убраны лишние пакеты и закомментированы Docker/yq

- Убраны пакеты: vim, jq, git, htop, tree из всех Dockerfile
- Закомментированы установки Docker, Docker Compose, yq
- Обновлен Rocky Linux до версии 9 с Python 3
- Исправлена проблема с passlib в ansible-controller
- Оставлены только необходимые пакеты: systemd, curl, wget, nano, python3, sudo

dockerfiles/alma/Dockerfile

@@ -15,27 +15,27 @@ RUN dnf install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    jq \
-    python3 \
-    python3-pip \
+    python39 \
+    python39-pip \
     sudo \
     && dnf clean all
 
+# Создаем symlink для python3 -> python3.9
+RUN ln -sf /usr/bin/python3.9 /usr/bin/python3
+
 # Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
+#     && chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker
-RUN dnf install -y dnf-plugins-core \
-    && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
-    && dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+# RUN dnf install -y dnf-plugins-core \
+#     && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+#     && dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/alt-linux/Dockerfile

@@ -14,12 +14,7 @@ RUN apt-get install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim-enhanced \
     nano \
-    htop \
-    tree \
-    jq \
     python3 \
     sudo \
     && apt-get clean
@@ -28,19 +23,19 @@ RUN apt-get install -y \
 RUN curl -sS https://bootstrap.pypa.io/pip/3.7/get-pip.py | python3
 
 # Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
+#     && chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker вручную для ALT Linux
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    gnupg \
-    && apt-get clean
+# RUN apt-get update && apt-get install -y \
+#     ca-certificates \
+#     curl \
+#     gnupg \
+#     && apt-get clean
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/ansible-controller/Dockerfile

@@ -16,8 +16,8 @@ RUN apt-get install -y \
     build-essential \
     && apt-get clean
 
-# Устанавливаем Ansible и ansible-lint
-RUN pip3 install ansible ansible-core ansible-lint
+# Устанавливаем Ansible, ansible-lint и passlib для хеширования паролей
+RUN pip3 install ansible ansible-core ansible-lint passlib
 
 # Устанавливаем дополнительные пакеты
 RUN apt-get install -y \
@@ -56,8 +56,12 @@ RUN curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-linux-amd64 \
 #    && mv istio-1.22.1/bin/istioctl /usr/local/bin/ \
 #    && rm -rf istio-1.22.1
 
-# Копируем requirements.yml
+# Копируем файлы зависимостей
 COPY requirements.yml /tmp/requirements.yml
+COPY requirements.txt /tmp/requirements.txt
+
+# Устанавливаем Python зависимости
+RUN pip3 install -r /tmp/requirements.txt
 
 # Устанавливаем Ansible коллекции
 RUN ansible-galaxy collection install -r /tmp/requirements.yml

dockerfiles/ansible-controller/requirements.txt

@@ -0,0 +1,9 @@
+# Python зависимости для Ansible Controller
+# Автор: Сергей Антропов
+# Сайт: https://devops.org.ru
+
+# Основные зависимости для работы с паролями
+passlib>=1.7.4
+
+# Дополнительные зависимости для безопасности
+bcrypt>=4.0.1

dockerfiles/ansible-controller/requirements.yml

@@ -1,9 +1,9 @@
 ---
-# Ansible Collections для Molecule Universal
+# Ansible Collections for Molecule Universal
 collections:
   - name: community.docker
     version: ">=3.0.0"
   - name: community.general
     version: ">=7.0.0"
   - name: ansible.posix
-    version: ">=1.5.4"
+    version: ">=1.5.4"

dockerfiles/astra-linux/Dockerfile

@@ -15,37 +15,34 @@ RUN apt-get install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    htop \
-    tree \
-    jq \
     python3 \
     python3-pip \
     sudo \
     && apt-get clean
 
-# Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# Устанавливаем yq (автоопределение архитектуры)
+# RUN ARCH=$(dpkg --print-architecture | sed 's/amd64/amd64/; s/arm64/arm64/; s/aarch64/arm64/') && \
+#     wget -qO /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${ARCH}" && \
+#     chmod +x /usr/local/bin/yq
 
-# Устанавливаем Docker вручную для AstraLinux
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    gnupg \
-    lsb-release \
-    && mkdir -p /usr/share/keyrings \
-    && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
-    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian buster stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update \
-    && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
-    && apt-get clean
+# Устанавливаем Docker вручную для AstraLinux (автоопределение архитектуры)
+# RUN ARCH=$(dpkg --print-architecture) && \
+#     apt-get update && apt-get install -y \
+#     ca-certificates \
+#     curl \
+#     gnupg \
+#     lsb-release && \
+#     mkdir -p /usr/share/keyrings && \
+#     curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+#     echo "deb [arch=${ARCH} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian buster stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+#     apt-get update && \
+#     apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin && \
+#     apt-get clean
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Отключаем Parsec для работы в контейнере
 RUN if [ -f /etc/parsec/parsec.conf ]; then \

dockerfiles/centos/Dockerfile

@@ -14,25 +14,22 @@ RUN dnf install -y --allowerasing \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    jq \
     python3 \
     python3-pip \
     sudo \
     && dnf clean all
 
 # Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
+#     && chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker
-RUN curl -fsSL https://get.docker.com | sh
+# RUN curl -fsSL https://get.docker.com | sh
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/debian/Dockerfile

@@ -14,33 +14,28 @@ RUN apt-get install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    htop \
-    tree \
-    jq \
     python3 \
     python3-pip \
     sudo \
     && apt-get clean
 
 # Устанавливаем Docker вручную для Debian
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    gnupg \
-    lsb-release \
-    && mkdir -p /usr/share/keyrings \
-    && 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 bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update \
-    && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
-    && apt-get clean
+# RUN apt-get update && apt-get install -y \
+#     ca-certificates \
+#     curl \
+#     gnupg \
+#     lsb-release \
+#     && mkdir -p /usr/share/keyrings \
+#     && 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 bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
+#     && apt-get update \
+#     && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
+#     && apt-get clean
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/redos/Dockerfile

@@ -16,28 +16,26 @@ RUN dnf install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    jq \
     python3 \
     python3-pip \
     sudo \
     && dnf clean all
 
-# Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# Устанавливаем yq (автоопределение архитектуры)
+# RUN ARCH=$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/') && \
+#     wget -qO /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${ARCH}" && \
+#     chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker вручную для RED OS
-RUN dnf install -y dnf-plugins-core \
-    && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
-    && dnf install -y docker-ce docker-ce-cli containerd.io \
-    && dnf clean all
+# RUN dnf install -y dnf-plugins-core \
+#     && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+#     && dnf install -y docker-ce docker-ce-cli containerd.io \
+#     && dnf clean all
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/rhel/Dockerfile

@@ -14,25 +14,25 @@ RUN dnf install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    jq \
-    python3 \
-    python3-pip \
+    python39 \
+    python39-pip \
     sudo \
     && dnf clean all
 
+# Создаем symlink для python3 -> python3.9
+RUN ln -sf /usr/bin/python3.9 /usr/bin/python3
+
 # Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
+#     && chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker
-RUN curl -fsSL https://get.docker.com | sh
+# RUN curl -fsSL https://get.docker.com | sh
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/rocky/Dockerfile

@@ -2,7 +2,7 @@
 # Автор: Сергей Антропов
 # Сайт: https://devops.org.ru
 
-FROM rockylinux:8
+FROM rockylinux:9
 
 # Обновляем систему
 RUN dnf update -y && dnf upgrade -y
@@ -14,27 +14,30 @@ RUN dnf install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    jq \
     python3 \
     python3-pip \
+    python3-devel \
     sudo \
     && dnf clean all
 
-# Устанавливаем yq
-RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 \
-    && chmod +x /usr/local/bin/yq
+# Устанавливаем более новую версию Python через pip если нужно
+RUN python3 -m pip install --upgrade pip
+
+# Устанавливаем yq (автоматически определяем архитектуру)
+# RUN ARCH=$(uname -m) && \
+#     if [ "$ARCH" = "x86_64" ]; then ARCH="amd64"; elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64"; fi && \
+#     wget -qO /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${ARCH}" && \
+#     chmod +x /usr/local/bin/yq
 
 # Устанавливаем Docker
-RUN dnf install -y dnf-plugins-core \
-    && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
-    && dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+# RUN dnf install -y dnf-plugins-core \
+#     && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+#     && dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target

dockerfiles/ubuntu/Dockerfile

@@ -14,33 +14,28 @@ RUN apt-get install -y \
     dbus \
     curl \
     wget \
-    git \
-    vim \
     nano \
-    htop \
-    tree \
-    jq \
     python3 \
     python3-pip \
     sudo \
     && apt-get clean
 
 # Устанавливаем Docker вручную для Ubuntu
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    gnupg \
-    lsb-release \
-    && mkdir -p /usr/share/keyrings \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/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/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update \
-    && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
-    && apt-get clean
+# RUN apt-get update && apt-get install -y \
+#     ca-certificates \
+#     curl \
+#     gnupg \
+#     lsb-release \
+#     && mkdir -p /usr/share/keyrings \
+#     && curl -fsSL https://download.docker.com/linux/ubuntu/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/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
+#     && apt-get update \
+#     && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \
+#     && apt-get clean
 
 # Устанавливаем Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-    && chmod +x /usr/local/bin/docker-compose
+# RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+#     && chmod +x /usr/local/bin/docker-compose
 
 # Настраиваем systemd
 RUN systemctl set-default multi-user.target