Fix failing tests (#17)

.github/workflows/ci.yml

@@ -44,14 +44,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian8
-          - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
+          - distro: debian11
+          - distro: debian12
           - distro: ubuntu1804
           - distro: ubuntu2004
+          - distro: ubuntu2204
 
     steps:
       - name: Check out the codebase
@@ -65,8 +63,8 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
-
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
       - name: Run Molecule tests
         run: |
           molecule test

Vagrantfile

@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -23,26 +16,33 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
+  },
+  {
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
+    :cpu => "50",
+    :ram => "512"
   },
   {
-    :name => "debian-8",
-    :box => "bento/debian-8",
-    :ip => '10.0.0.16',
+    :name => "debian-10",
+    :box => "bento/debian-10",
+    :ip => '10.0.0.18',
     :cpu => "50",
     :ram => "256"
   },
   {
-    :name => "debian-9",
-    :box => "bento/debian-9",
-    :ip => '10.0.0.17',
+    :name => "debian-11",
+    :box => "bento/debian-11",
+    :ip => '10.0.0.19',
     :cpu => "50",
     :ram => "256"
   },
   {
-    :name => "debian-10",
-    :box => "bento/debian-10",
-    :ip => '10.0.0.18',
+    :name => "debian-12",
+    :box => "bento/debian-12",
+    :ip => '10.0.0.20',
     :cpu => "50",
     :ram => "256"
   },

meta/main.yml

@@ -10,14 +10,14 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
+        - jammy
     - name: Debian
       versions:
-        - jessie
-        - stretch
         - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - development
     - packaging

molecule/default/collections.yml

@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []

molecule/default/molecule.yml

@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/main.yml

@@ -52,7 +52,7 @@
 
 - name: updatedb
   ansible.builtin.import_tasks: updatedb.yml
-  when: docker_manage_updatedb
+  when: docker_manage_updatedb | bool
   tags:
     - configuration
     - docker

tasks/repository.yml

@@ -2,7 +2,7 @@
 ---
 - name: repository | dependencies
   ansible.builtin.apt:
-    name: "{{ docker_dependencies_pre }}"
+    name: "{{ ' '.join(docker_dependencies_pre).split() }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
@@ -11,8 +11,8 @@
 
 # Old python (TLS issues)
 - name: repository | old python
+  when: ansible_python_version is version('2.7.9', '<')
   block:
-
     - name: repository | create (download) directory
       ansible.builtin.file:
         path: "{{ docker_downloads_path }}"
@@ -42,12 +42,10 @@
       tags:
         - docker-repository-public-key
 
-  when: ansible_python_version is version('2.7.9', '<')
-
 # New python
 - name: repository | new python
+  when: ansible_python_version is version('2.7.9', '>=')
   block:
-
     - name: repository | add public key
       ansible.builtin.apt_key:
         id: "{{ item.id }}"
@@ -57,8 +55,6 @@
       tags:
         - docker-repository-public-key
 
-  when: ansible_python_version is version('2.7.9', '>=')
-
 - name: repository | add
   ansible.builtin.apt_repository:
     repo: "{{ item.type }} {{ item.url }} {{ item.component }}"

tasks/updatedb.yml

@@ -11,5 +11,6 @@
   ansible.builtin.command: >
     /usr/bin/updatedb -e /var/lib/docker
   when: _updatedb_file_stats.stat.exists
+  changed_when: true
   tags:
     - docker-updatedb-disable-indexing

templates/etc/default/docker.j2

@@ -1,5 +1,4 @@
-# {{ ansible_managed }}
-
+{{ ansible_managed | comment }}
 # Docker Upstart and SysVinit configuration file
 
 #

vars/main.yml

@@ -1,14 +1,13 @@
 # vars file
 ---
-docker_dependencies_pre_dummy_package: apt
 docker_dependencies_pre:
   - software-properties-common
   - dirmngr
   - apt-transport-https
   - curl
   - apparmor
-  - "{{ (ansible_distribution == 'Ubuntu') | ternary('linux-image-extra-virtual', docker_dependencies_pre_dummy_package) }}"
-  - "{{ (ansible_distribution == 'Ubuntu') | ternary('cgroup-lite', docker_dependencies_pre_dummy_package) }}"
+  - "{{ (ansible_distribution == 'Ubuntu') | ternary('linux-image-extra-virtual', '') }}"
+  - "{{ (ansible_distribution == 'Ubuntu') | ternary('cgroup-lite', '') }}"
 
 docker_apt_keys:
   - id: 8D81803C0EBFCD88