From 476bfebe1c57f91fc03a2cd674cdd5dac5bb8312 Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Wed, 25 Aug 2021 21:50:18 +0100
Subject: [PATCH] fix(clean): remove containers/compose before software

---
 docker/clean.sls                  | 4 ++--
 docker/osfamilymap.yaml           | 1 -
 docker/osfingermap.yaml           | 1 +
 docker/software/package/clean.sls | 4 +++-
 kitchen.yml                       | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/clean.sls b/docker/clean.sls
index 71f12c9b..5fd60c80 100644
--- a/docker/clean.sls
+++ b/docker/clean.sls
@@ -2,6 +2,6 @@
 # vim: ft=sls
 
 include:
-  # .containers.clean
-  # .compose.clean
+  - .containers.clean
+  - .compose.clean
   - .software.clean
diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml
index eedb872c..0cd4d4fd 100644
--- a/docker/osfamilymap.yaml
+++ b/docker/osfamilymap.yaml
@@ -52,7 +52,6 @@ RedHat:
   pkg:
     deps:
       - python3-pip
-      # python3-docker
       - iptables
       - git
       - tar
diff --git a/docker/osfingermap.yaml b/docker/osfingermap.yaml
index f66edc6e..ab77fa2f 100644
--- a/docker/osfingermap.yaml
+++ b/docker/osfingermap.yaml
@@ -31,6 +31,7 @@ CentOS Linux-7:
       - selinux-policy-minimum
       - yum-plugin-versionlock
       - python3-pip
+      - python3-docker
       - iptables
       - git
       - tar
diff --git a/docker/software/package/clean.sls b/docker/software/package/clean.sls
index 3183637b..1690aa3c 100644
--- a/docker/software/package/clean.sls
+++ b/docker/software/package/clean.sls
@@ -16,7 +16,9 @@ include:
         {%- if grains.kernel|lower in ('linux', 'darwin') %}
 {{ formula }}-software-package-clean-pkg:
   pkg.removed:
-    - name: {{ d.pkg.docker.name }}
+    - names:
+      - {{ d.pkg.docker.name }}
+      - python3-docker
     - reload_modules: {{ d.misc.reload|default(true, true) }}
             {%- if enable_repo %}
     - require:
diff --git a/kitchen.yml b/kitchen.yml
index eb26e9df..068d596f 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -730,6 +730,7 @@ suites:
         base:
           '*':
             - docker._mapdata
+            - docker
             - docker.clean
       pillars:
         top.sls: