From 3b572765eb7c3fa07b349224dc8918fcd6be87e4 Mon Sep 17 00:00:00 2001
From: "Troy W." <pyrodie18@gmail.com>
Date: Sun, 9 Jun 2024 00:20:49 -0400
Subject: [PATCH] Fixed Molecule

---
 molecule/zabbix_proxy/Dockerfile.redhat.j2 |  3 ---
 molecule/zabbix_proxy/destroy.yml          | 23 ----------------------
 molecule/zabbix_proxy/molecule.yml         |  7 +++----
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 molecule/zabbix_proxy/Dockerfile.redhat.j2
 delete mode 100644 molecule/zabbix_proxy/destroy.yml

diff --git a/molecule/zabbix_proxy/Dockerfile.redhat.j2 b/molecule/zabbix_proxy/Dockerfile.redhat.j2
deleted file mode 100644
index dd48ee3b7..000000000
--- a/molecule/zabbix_proxy/Dockerfile.redhat.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM {{ item.base_image }}
-RUN yum install -y python3-pip
-CMD ["/sbin/init"]
diff --git a/molecule/zabbix_proxy/destroy.yml b/molecule/zabbix_proxy/destroy.yml
deleted file mode 100644
index 7ef374be5..000000000
--- a/molecule/zabbix_proxy/destroy.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Destroy
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
-  vars:
-    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
-    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
-  tasks:
-    - name: Destroy molecule instance(s)
-      docker_container:
-        name: "{{ item.name }}"
-        state: absent
-        force_kill: "{{ item.force_kill | default(True) }}"
-      with_items: "{{ molecule_yml.platforms }}"
-
-    - name: Destroy 3rd party instance(s)
-      docker_container:
-        name: "{{ item.name }}-db"
-        state: absent
-        force_kill: true
-      loop: "{{ molecule_yml.platforms }}"
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
index 8c7b3df48..ac0d7e33c 100644
--- a/molecule/zabbix_proxy/molecule.yml
+++ b/molecule/zabbix_proxy/molecule.yml
@@ -3,11 +3,10 @@ driver:
   name: docker
 platforms:
   - name: zabbix-proxy-${MY_MOLECULE_VERSION:-v70}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
-    dockerfile: Dockerfile.${MY_MOLECULE_OS_FAMILY:-redhat}.j2
-    base_image: ${MY_MOLECULE_IMAGE:-rockylinux/rockylinux:8-ubi-init}
-    image: ${MY_MOLECULE_CONTAINER:-rockylinux8}
+    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
     privileged: true
-    command: /sbin/init
+    pre_build_image: true
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
     networks:
       - name: zabbix
     volumes: