Merge branch 'main' into refactor_zabbix_web

ansible-collections · Jun 11, 2024 · 8859729 · 8859729
2 parents 0d9a25d + 825d112
commit 8859729
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -76,9 +76,9 @@ jobs:
 
       - name: Run role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.container.name }}
-          MY_MOLECULE_IMAGE=${{ matrix.container.base_image }}
-          MY_MOLECULE_OS_FAMILY=${{ matrix.container.os_family }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
           MY_MOLECULE_VERSION=${{ matrix.version }}
           MY_MOLECULE_DATABASE=${{ matrix.database }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}
diff --git a/molecule/zabbix_proxy/Dockerfile.debian.j2 b/molecule/zabbix_proxy/Dockerfile.debian.j2
diff --git a/molecule/zabbix_proxy/Dockerfile.redhat.j2 b/molecule/zabbix_proxy/Dockerfile.redhat.j2
diff --git 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: