Обновлен образ контроллера в Makefile

- Изменена переменная DOCKER_IMAGE на inecs/ansible-lab:ansible-controller-latest
- Обновлена команда сборки контроллера для использования нового формата тегов
- Обновлен docker-compose.yml для использования готового образа
- Обновлена справка с новым именем образа
- Добавлены ubuntu и debian в список собираемых образов
- Теперь контроллер использует единый формат тегов с остальными образами

Автор: Сергей Антропов
Сайт: https://devops.org.ru

Makefile

@@ -24,7 +24,7 @@ PROJECT_NAME ?= ansible-template
 VERSION ?= 0.1.0
 AUTHOR ?= "Сергей Антропов"
 SITE ?= "https://devops.org.ru"
-DOCKER_IMAGE ?= inecs/ansible-controller:latest
+DOCKER_IMAGE ?= inecs/ansible-lab:ansible-controller-latest
 DOCKER_DIND_IMAGE ?= docker:27-dind
 CONTAINER_NAME ?= ansible-controller
 
@@ -516,7 +516,7 @@ docker:
 			echo ""; \
 			echo "  🐳 make docker build     - собрать все Docker образы (multi-arch)"; \
 			echo "     💡 Собирает: ansible-controller, alt-linux, astra-linux, redos"; \
-			echo "     💡 Собирает: rhel, centos, alma, rocky"; \
+			echo "     💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
 			echo "     💡 Платформы: $(DOCKER_PLATFORMS)"; \
 			echo "     💡 Тегирует: inecs/образ:<tag> (автоматически извлекает теги)"; \
 			echo "     💡 Отправляет: автоматически в Docker Hub"; \
@@ -570,7 +570,7 @@ docker:
 			echo ""; \
 			echo "  🐳 make docker build     - собрать все Docker образы (multi-arch)"; \
 			echo "     💡 Собирает: ansible-controller, alt-linux, astra-linux, redos"; \
-			echo "     💡 Собирает: rhel, centos, alma, rocky"; \
+			echo "     💡 Собирает: rhel, centos, alma, rocky, ubuntu, debian"; \
 			echo "     💡 Платформы: $(DOCKER_PLATFORMS)"; \
 			echo "     💡 Тегирует: inecs/образ:<tag> (автоматически извлекает теги)"; \
 			echo "     💡 Отправляет: автоматически в Docker Hub"; \
@@ -817,7 +817,8 @@ controller:
 			cd dockerfiles/ansible-controller && \
 			docker buildx build \
 				--platform $(DOCKER_PLATFORMS) \
-				--tag $(DOCKER_REGISTRY)/ansible-controller:$(DOCKER_VERSION) \
+				--tag $(DOCKER_REGISTRY):ansible-controller-$(DOCKER_VERSION) \
+				--tag $(DOCKER_REGISTRY):ansible-controller-latest \
 				--push \
 				.; \
 			echo "✅ ansible-controller собран и отправлен";; \
@@ -833,7 +834,7 @@ controller:
 			echo "🎯 Доступные команды:"; \
 			echo ""; \
 			echo "  🔨 make controller build  - собрать ansible-controller (multi-arch)"; \
-			echo "     💡 Собирает: inecs/ansible-controller:latest"; \
+			echo "     💡 Собирает: inecs/ansible-lab:ansible-controller-latest"; \
 			echo "     💡 Платформы: $(DOCKER_PLATFORMS)"; \
 			echo "     💡 Использует: dockerfiles/ansible-controller/Dockerfile"; \
 			echo "     💡 Requirements: dockerfiles/ansible-controller/requirements.yml"; \

dockerfiles/ansible-controller/docker-compose.yml

@@ -2,9 +2,7 @@ version: "3.9"
 
 services:
   ansible-controller:
-    build:
+    image: inecs/ansible-lab:ansible-controller-latest
-      context: .
-      dockerfile: Dockerfile
     container_name: ansible-controller
     privileged: true
     command: sleep infinity

molecule/presets/default.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -18,7 +16,6 @@ images:
   rocky: "inecs/ansible-lab:rocky-latest"
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
-  debian: "inecs/ansible-lab:debian-latest"  ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
 
 systemd_defaults:
@@ -37,3 +34,18 @@ hosts:
   - name: u2
     family: rhel
     groups: [test, web]
+
+  # DinD узел (Docker-in-Docker)
+  - name: docker1
+    type: dind
+    groups: [docker]
+    publish: ["8080:8080"]
+
+  # DOoD узел (Docker-out-of-Docker)
+  - name: dood1
+    type: dood
+    family: debian
+    groups: [dood]
+    publish: ["8081:8081"]
+    env:
+      DOCKER_HOST: unix:///var/run/docker.sock

molecule/presets/docker-test.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/etcd-patroni.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/minimal.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/multi-os.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы для разных ОС
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/performance.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/security.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/standart.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+
 systemd_defaults:
   privileged: true
   command: "/sbin/init"

molecule/presets/test.yml

@@ -8,8 +8,6 @@ generated_inventory: "{{ molecule_ephemeral_directory }}/inventory/hosts.ini"
 
 # systemd-ready образы
 images:
-  debian: "ghcr.io/ansible-community/molecule-ubuntu-systemd:jammy"
-  # Собственные образы AnsibleTemplate
   alt: "inecs/ansible-lab:alt-linux-latest"
   astra: "inecs/ansible-lab:astra-linux-latest"
   rhel: "inecs/ansible-lab:rhel-latest"
@@ -19,6 +17,7 @@ images:
   redos: "inecs/ansible-lab:redos-latest"
   ubuntu: "inecs/ansible-lab:ubuntu-latest"
   debian: "inecs/ansible-lab:debian-latest"
+  
 systemd_defaults:
   privileged: true
   command: "/sbin/init"