fix(debian): avoid adding repositories entries multiple times

Entries are being duplicated as described in

* saltstack/salt#60220 and
* saltstack/salt#59785 (comment)

Author: javierbertoli

docker/compose/software/package/install.sls

@@ -7,6 +7,7 @@
     {%- if d.pkg.compose.use_upstream in ('package', 'repo') %}
         {%- if grains.os_family in ('RedHat', 'Debian') %}
             {%- set sls_repo_install = tplroot ~ '.software.package.repo.install' %}
+            {%- set resource_repo_managed = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
 
 include:
   - {{ sls_repo_install }}
@@ -25,8 +26,9 @@ docker-compose-package-install-pkgs:
     - runas: {{ d.identity.rootuser }}
     - reload_modules: true
         {%- if grains.os_family in ('RedHat', 'Debian') %}
+    - refresh: {{ d.misc.refresh|default(true, true) }}
     - require:
-      - pkgrepo: docker-software-package-repo-managed
+      - {{ resource_repo_managed }}: docker-software-package-repo-managed
         {%- endif %}
 
     {%- else %}

docker/software/package/install.sls

@@ -9,6 +9,7 @@
         {%- set docker_pkg_version = d.version | default(d.pkg.version, true) %}
         {%- if enable_repo %}
             {%- set sls_repo_install = tplroot ~ '.software.package.repo.install' %}
+            {%- set resource_repo_managed = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
 include:
   - {{ sls_repo_install }}
         {%- endif %}
@@ -45,7 +46,7 @@ docker-software-package-install-pkg:
             {%- endif %}
             {%- if enable_repo %}
     - require:
-      - pkgrepo: docker-software-package-repo-managed
+      - {{ resource_repo_managed }}: docker-software-package-repo-managed
             {%- endif %}
 
         {%- elif grains.kernel|lower in ('windows',) %}

docker/software/package/repo/install.sls

@@ -5,10 +5,10 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
-    {%- if 'repo' in d.pkg.docker and d.pkg.docker.repo %}
-        {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+{%- if 'repo' in d.pkg.docker and d.pkg.docker.repo %}
+  {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
-{% if grains.os_family == 'Debian' %}
+  {% if grains.os_family == 'Debian' %}
 docker-software-package-repo-keyring-managed:
   file.managed:
     - name: {{ d.pkg.docker.repo_keyring }}
@@ -17,14 +17,20 @@ docker-software-package-repo-keyring-managed:
                  )
               }}
     - require_in:
-      - pkgrepo: docker-software-package-repo-managed
-{%- endif %}
+      - file: docker-software-package-repo-managed
 
+docker-software-package-repo-managed:
+  file.managed:
+    - name: {{ d.pkg.docker.repo.file }}
+    - contents: {{ d.pkg.docker.repo.name }}
+
+  {%- else %}
 
 docker-software-package-repo-managed:
   pkgrepo.managed:
     {{- format_kwargs(d.pkg.docker.repo) }}
     - humanname: {{ grains["os"] }} {{ grains["oscodename"]|capitalize }} Docker Package Repository
     - refresh: {{ d.misc.refresh }}
 
-    {%- endif %}
+  {%- endif %}
+{%- endif %}