From 4e2e218aae570383c6d1d4055df65030aa9308e4 Mon Sep 17 00:00:00 2001
From: Sergey Antropoff <sergey@antropoff.ru>
Date: Tue, 21 Oct 2025 00:47:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20ansible-vault=20=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Исправлена ошибка ansible-vault в Dockerfile-Ubuntu (установка версии <4.0.0)
- Убраны -latest из тегов ubuntu и centos в Makefile
- Обновлены теги в molecule.yml: inecs/ansible:centos и inecs/ansible:ubuntu
- Пересобраны все образы с новыми тегами и исправленными зависимостями
- Все образы успешно опубликованы в Docker Hub с поддержкой amd64 и arm64
---
 Dockerfile-Ubuntu             | 10 +++++++---
 Makefile                      |  4 ++--
 molecule/default/molecule.yml |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Dockerfile-Ubuntu b/Dockerfile-Ubuntu
index 675f92f..416bce7 100644
--- a/Dockerfile-Ubuntu
+++ b/Dockerfile-Ubuntu
@@ -30,11 +30,15 @@ RUN apt-get update && \
     lsb-release \
     && rm -rf /var/lib/apt/lists/*
 
-# Устанавливаем Python пакеты для Ansible
+# Устанавливаем Python пакеты для Ansible с обновлением зависимостей
 RUN pip install --upgrade pip && \
-    pip install \
+    pip install --upgrade \
+    requests \
+    PyYAML \
+    ansible-core \
+    && pip install \
     ansible \
-    ansible-vault \
+    "ansible-vault<4.0.0" \
     molecule \
     molecule-docker \
     ansible-lint \
diff --git a/Makefile b/Makefile
index 89f60db..fb5437e 100644
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,9 @@ docker:
 			echo "Собираем и пушим основной Ansible образ..."; \
 			docker buildx build -t $(REGISTRY)/$(IMAGE):$(TAG) -t $(REGISTRY)/$(IMAGE):latest --platform linux/amd64,linux/arm64 --push .; \
 			echo "Собираем и пушим образ CentOS..."; \
-			docker buildx build -t $(REGISTRY):centos-latest --platform linux/amd64,linux/arm64 --push -f Dockerfile-CentOS .; \
+			docker buildx build -t $(REGISTRY):centos --platform linux/amd64,linux/arm64 --push -f Dockerfile-CentOS .; \
 			echo "Собираем и пушим образ Ubuntu..."; \
-			docker buildx build -t $(REGISTRY):ubuntu-latest --platform linux/amd64,linux/arm64 --push -f Dockerfile-Ubuntu .; \
+			docker buildx build -t $(REGISTRY):ubuntu --platform linux/amd64,linux/arm64 --push -f Dockerfile-Ubuntu .; \
 			echo "Образы успешно опубликованы в Docker Hub: $(REGISTRY)";; \
 		*) echo "Unknown action. Available actions: build, rebuild, prune, release";; \
 	esac
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b6d026b..cc40f80 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ driver:
 
 platforms:
   - name: centos
-    image: "inecs/ansible:centos-latest"
+    image: "inecs/ansible:centos"
     privileged: true
     pre_build_image: true
     volumes:
@@ -20,7 +20,7 @@ platforms:
       - /tmp
       - /run
   - name: ubuntu
-    image: "inecs/ansible:ubuntu-latest"
+    image: "inecs/ansible:ubuntu"
     privileged: true
     pre_build_image: true
     volumes: