From 42c7b012cad1d758b3bbe6e4b57e03fcc7b75cb7 Mon Sep 17 00:00:00 2001
From: jseniuk <69060445+jseniuk@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:15:52 -0700
Subject: [PATCH] feat: bring inline with other tests (#13)

---
 .github/workflows/molecule.yml | 15 ++++++++++-----
 molecule/default/molecule.yml  |  6 +++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index ab940ac..f8a3cff 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -27,16 +27,21 @@ jobs:
     strategy:
       matrix:
         image:
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:jammy
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:focal
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/rockylinux:9
+          - geerlingguy/docker-ubuntu2404-ansible:latest
+          - geerlingguy/docker-ubuntu2204-ansible:latest
+          - geerlingguy/docker-ubuntu2004-ansible:latest
+          - geerlingguy/docker-ubuntu1804-ansible:latest
+          - geerlingguy/docker-ubuntu1604-ansible:latest
+          - geerlingguy/docker-centos9-ansible:latest
+          - geerlingguy/docker-centos8-ansible:latest
+          - geerlingguy/docker-centos7-ansible:latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@4.0.9
+        uses: robertdebock/molecule-action@6.0.1
         with:
           image: "${{ matrix.image }}"
           options: parallel
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index fd98301..33315e7 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false