updated docker state

states/docker/defaults.yaml

@@ -9,7 +9,7 @@ docker:
     - python3-cryptography
   pip_pkgs:
     - docker==5.0.3
-    - docker-compose
+    - docker-compose==1.29.2
   daemon:
     config:
       storage-driver: overlay2

states/docker/init.sls

@@ -4,4 +4,5 @@ include:
   - .install
   - .config
   - .service
-  - .containers
+  - .containers
+  - .prune

states/docker/install.sls

@@ -4,8 +4,8 @@ docker-pkgs:
   pkg.installed:
     - pkgs: {{ docker.pkgs }}
 
-docker-pip-pkgs:
+{%- for pkg in docker.pip_pkgs %}
+docker-pip-{{ pkg }}:
   pip.installed:
-{%- for pip in docker.pip_pkgs %}
+    - name: {{ pkg }}
-    - name: {{ pip }}
 {%- endfor %}

states/docker/map.jinja

@@ -1,6 +1,5 @@
 {%- import_yaml "docker/defaults.yaml" as default_settings -%}
 
-{%- set defaults = salt['grains.filter_by'](default_settings, default='docker')
+{%- set defaults = salt['grains.filter_by'](default_settings, default='docker') -%}
--%}
 
-{%- set docker = salt['pillar.get']('docker', default=defaults, merge=True) -%}
+{%- set docker = salt['pillar.get']('docker', default=defaults, merge=True) -%}

states/docker/prune.sls

@@ -0,0 +1,5 @@
+---
+docker.prune:
+  module.run:
+    - docker.prune:
+      - images: true