Merge pull request #1 from saltstack-formulas/master

cordu-dev · web-flow · commit 24e51fde72af · 2021-06-11T13:15:17.000+03:00
Using releases from github instead of bintray
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
@@ -87,6 +87,10 @@ jobs:
           # - package-oraclelinux-7-master-py3
           # - clean-oraclelinux-7-master-py3
           # - oraclelinux-7-master-py3
+          # - archive-arch-base-latest-master-py3
+          # - package-arch-base-latest-master-py3
+          # - clean-arch-base-latest-master-py3
+          - arch-base-latest-master-py3
           # - archive-gentoo-stage3-latest-master-py3
           # - package-gentoo-stage3-latest-master-py3
           # - clean-gentoo-stage3-latest-master-py3
@@ -108,9 +112,6 @@ jobs:
           # - archive-oraclelinux-8-3003-0-py3
           # - archive-oraclelinux-7-3003-0-py3
           # - archive-arch-base-latest-3003-0-py3
-          # - package-arch-base-latest-3003-0-py3
-          # - clean-arch-base-latest-3003-0-py3
-          - arch-base-latest-3003-0-py3
           # - archive-gentoo-stage3-latest-3003-0-py3
           # - archive-gentoo-stage3-systemd-3003-0-py3
           # - archive-debian-10-3002-6-py3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -52,4 +52,3 @@ repos:
       - id: rstcheck
         name: Check reST files using rstcheck
         exclude: 'docs/CHANGELOG.rst'
-        args: [--report=warning]
diff --git a/.rstcheck.cfg b/.rstcheck.cfg
@@ -1,3 +1,4 @@
 [rstcheck]
-report=error
+report=info
 ignore_language=rst
+ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -4,14 +4,15 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|115
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|67
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|117
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|74
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1121702?v=4' width='36' height='36' alt='@cdarwin'>|[@cdarwin](https://github.com/cdarwin)|25
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|22
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|21
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|18
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|15
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/175579?v=4' width='36' height='36' alt='@vladvasiliu'>|[@vladvasiliu](https://github.com/vladvasiliu)|12
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10724315?v=4' width='36' height='36' alt='@danny-smit'>|[@danny-smit](https://github.com/danny-smit)|9
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|9
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1174343?v=4' width='36' height='36' alt='@ticosax'>|[@ticosax](https://github.com/ticosax)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/252961?v=4' width='36' height='36' alt='@alexproca'>|[@alexproca](https://github.com/alexproca)|6
@@ -61,4 +62,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-23.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-02.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,57 @@
 # Changelog
 
+## [2.0.7](https://github.com/saltstack-formulas/docker-formula/compare/v2.0.6...v2.0.7) (2021-06-02)
+
+
+### Bug Fixes
+
+* **clean:** fix syntax error in networks.clean ([89cd4fc](https://github.com/saltstack-formulas/docker-formula/commit/89cd4fccf0109fb37a33a4de762b6a2c5c02bbc2))
+
+## [2.0.6](https://github.com/saltstack-formulas/docker-formula/compare/v2.0.5...v2.0.6) (2021-05-21)
+
+
+### Bug Fixes
+
+* **service:** reload the docker service when daemon.json has changed ([b34f434](https://github.com/saltstack-formulas/docker-formula/commit/b34f434a5ae35ee1fb54b7c542a59d5ba4ab32da))
+
+## [2.0.5](https://github.com/saltstack-formulas/docker-formula/compare/v2.0.4...v2.0.5) (2021-05-20)
+
+
+### Bug Fixes
+
+* **clean:** fix clean of repo for the RedHat family ([4730a72](https://github.com/saltstack-formulas/docker-formula/commit/4730a725c773430674199be99fb8fffe65febfdf))
+* **clean:** fix syntax error in networks.clean state file ([53db7ad](https://github.com/saltstack-formulas/docker-formula/commit/53db7ad8ef775f725b5c339402473d15075174bc))
+* **clean:** fix syntax error with use_upstream repo ([428dccd](https://github.com/saltstack-formulas/docker-formula/commit/428dccdf15c119c32847db0374ff71152157c8a9))
+* **clean:** make repo install and clean states consistent ([af16bb7](https://github.com/saltstack-formulas/docker-formula/commit/af16bb7781da5653c50375c8e197591a2b7d7c09))
+* **clean:** remove invalid 'onlyif' statement from repo.clean ([b3c56cb](https://github.com/saltstack-formulas/docker-formula/commit/b3c56cb9e1784d217eb4cba71caf2a75b0c3a0d4))
+* **clean:** update condition that enables the repo ([1f5190b](https://github.com/saltstack-formulas/docker-formula/commit/1f5190b20c77cfc5be0e9150cce09b46917f7fdd))
+* **clean:** update enable_repo condition to be more robust ([a7f382f](https://github.com/saltstack-formulas/docker-formula/commit/a7f382f3f511b7006f0980efae3db7164ae2a95d))
+* **test:** add missing tests to verify installation from repo ([5a62de9](https://github.com/saltstack-formulas/docker-formula/commit/5a62de91f8afeed3656d939951739c6da3907b9d))
+
+
+### Continuous Integration
+
+* **kitchen:** use `master` as default instance for Arch Linux [skip ci] ([161d8cc](https://github.com/saltstack-formulas/docker-formula/commit/161d8cc691eb3dd389cdbce4f3cd54013c3093ed))
+
+## [2.0.4](https://github.com/saltstack-formulas/docker-formula/compare/v2.0.3...v2.0.4) (2021-05-19)
+
+
+### Bug Fixes
+
+* **config:** replace URLs to bintray.com by github.com ([2f60c21](https://github.com/saltstack-formulas/docker-formula/commit/2f60c21fc26dd790c4cb032671a59b477d0197e1))
+* **config:** use 'latest' docker-compose versions from github ([d434e25](https://github.com/saltstack-formulas/docker-formula/commit/d434e2570dbf775b34e2c98d835f9c0378709a63))
+
+
+### Continuous Integration
+
+* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([cec557a](https://github.com/saltstack-formulas/docker-formula/commit/cec557abc7dc77a5227852c216047855ab726c57))
+
+
+### Documentation
+
+* remove files which aren't formula-specific [skip ci] ([4cc1e70](https://github.com/saltstack-formulas/docker-formula/commit/4cc1e706e4778e1aabef0023da668eaafef8afff))
+* **readme:** fix headings and links [skip ci] ([b0021eb](https://github.com/saltstack-formulas/docker-formula/commit/b0021eb3a379fe8db7bed584fb6ae5d1f060a581))
+
 ## [2.0.3](https://github.com/saltstack-formulas/docker-formula/compare/v2.0.2...v2.0.3) (2021-04-23)
 
 
diff --git a/FORMULA b/FORMULA
@@ -1,7 +1,7 @@
 name: docker
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 2.0.3
+version: 2.0.7
 release: 1
 minimum_version: 2017.7
 summary: docker formula
diff --git a/docker/defaults.yaml b/docker/defaults.yaml
@@ -79,8 +79,8 @@ docker:
       binary:
         options: ''
         # yamllint disable-line rule:line-length
-        source: 'https://dl.bintray.com/docker-compose/master/docker-compose-Linux-x86_64'
-        source_hash: '3c96b57ea8e0027aee7e1a3023f7599bcecae54e77bcfd5f4e65a59672637e54'
+        source: 'https://github.com/docker/compose/releases/latest/download/docker-compose-Linux-x86_64'
+        source_hash: null
 
   networks: {}
   containers:
diff --git a/docker/map.jinja b/docker/map.jinja
@@ -62,6 +62,7 @@
                     {%- if 'source_hash' in p.binary and p.binary.source_hash %}
                         {%- do p.binary.update({'name': p.path, 'source_hash': p.binary.source_hash}) %}
                     {%- else %}
+                        {%- set url = p.binary.source %}
                         {%- do p.binary.update({'name': p.path, 'source_hash': url ~ '.sha256'}) %}
                     {%- endif %}
 
diff --git a/docker/networks/clean.sls b/docker/networks/clean.sls
@@ -13,10 +13,11 @@
 include:
   - {{ sls_archive if d.pkg.docker.use_upstream == 'archive' else sls_desktop if d.pkg.docker.use_upstream == 'desktop' else sls_package }}
 
-        {%- for name in docker.networks %}
+        {%- for name in d.networks %}
 
 {{ formula }}-network-{{ name }}-absent:
   docker_network.absent:
     - name: {{ name }}
 
         {%- endfor %}
+    {%- endif %}
diff --git a/docker/osfamilymap.yaml b/docker/osfamilymap.yaml
@@ -59,6 +59,7 @@ RedHat:
     docker:
       # environ_file: /etc/sysconfig/docker
       repo:
+        name: docker-ce
         baseurl: 'https://download.docker.com/linux/{{ grains.os|lower }}/$releasever/$basearch/stable'
         file: '/etc/yum.repos.d/docker-ce.repo'
         gpgkey: 'https://download.docker.com/linux/{{ grains.os|lower }}/gpg'
@@ -95,8 +96,8 @@ MacOS:
       name: docker-compose   # homebrew
       use_upstream: package   # Docker Desktop
       archive:
-        source: 'https://dl.bintray.com/docker-compose/master/docker-compose-Darwin-x86_64'
-        source_hash: 'c5e326611efa45cbaf5b338bf352cbf27e9eb7dff0619f77639cae1158f6571f'
+        source: 'https://github.com/docker/compose/releases/latest/download/docker-compose-Darwin-x86_64'
+        source_hash: null
 
 Windows:
   div: '\'
diff --git a/docker/software/package/clean.sls b/docker/software/package/clean.sls
@@ -6,19 +6,21 @@
 {%- set formula = d.formula %}
 
     {%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
-        {%- if grains.kernel|lower in ('linux',) %}
-            {%- if d.pkg.docker.use_upstream == 'repo' %}
+        {%- set enable_repo = grains.os_family in ('RedHat', 'Debian') and d.pkg.docker.get('repo') %}
+        {%- if enable_repo %}
+            {%- set sls_repo_clean = tplroot ~ '.software.package.repo.clean' %}
 include:
-  - .package.repo.clean
-            {%- endif %}
+  - {{ sls_repo_clean }}
+        {%- endif %}
 
+        {%- if grains.kernel|lower in ('linux', 'darwin') %}
 {{ formula }}-software-package-clean-pkg:
   pkg.removed:
     - name: {{ d.pkg.docker.name }}
     - reload_modules: {{ d.misc.reload|default(true, true) }}
-            {%- if d.pkg.docker.use_upstream == 'repo' %}
+            {%- if enable_repo %}
     - require:
-      - pkgrepo: {{ formula }}-package-repo-absent
+      - pkgrepo: {{ formula }}-software-package-repo-absent
             {%- endif %}
 
         {%- elif grains.os_family == 'MacOS' %}
diff --git a/docker/software/package/install.sls b/docker/software/package/install.sls
@@ -6,13 +6,14 @@
 {%- set formula = d.formula %}
 
     {%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
+        {%- set enable_repo = grains.os_family in ('RedHat', 'Debian') and d.pkg.docker.get('repo') %}
         {%- set docker_pkg_version = d.version | default(d.pkg.version, true) %}
-        {%- if grains.os_family in ('RedHat', 'Debian') %}
+        {%- if enable_repo %}
             {%- set sls_repo_install = tplroot ~ '.software.package.repo.install' %}
-
 include:
   - {{ sls_repo_install }}
         {%- endif %}
+
         {%- if grains.kernel|lower in ('linux', 'darwin') %}
             {%- if 'deps' in d.pkg and d.pkg.deps %}
 
@@ -43,7 +44,7 @@ include:
             {%- if grains.os|lower not in ('suse',) %}
     - hold: {{ d.misc.hold|default(false, true) }}
             {%- endif %}
-            {%- if grains.os_family in ('RedHat', 'Debian') %}
+            {%- if enable_repo %}
     - require:
       - pkgrepo: {{ formula }}-software-package-repo-managed
             {%- endif %}
diff --git a/docker/software/package/repo/clean.sls b/docker/software/package/repo/clean.sls
@@ -5,8 +5,10 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
+    {%- if 'repo' in d.pkg.docker and d.pkg.docker.repo %}
+
 {{ formula }}-software-package-repo-absent:
   pkgrepo.absent:
     - name: {{ d.pkg.docker.repo.name }}
-    - onlyif:
-      - {{ d.pkg.docker.repo }}
+
+    {%- endif %}
diff --git a/docker/software/package/repo/install.sls b/docker/software/package/repo/install.sls
@@ -13,7 +13,5 @@
     {{- format_kwargs(d.pkg.docker.repo) }}
     - humanname: {{ grains["os"] }} {{ grains["oscodename"]|capitalize }} Docker Package Repository
     - refresh: {{ d.misc.refresh }}
-    - onlyif:
-      - {{ d.pkg.docker.repo }}
 
     {%- endif %}
diff --git a/docker/software/service/running.sls b/docker/software/service/running.sls
@@ -6,6 +6,7 @@
 {%- set formula = d.formula %}
 
     {%- if 'service' in d.pkg.docker and d.pkg.docker.service and grains.os != 'Windows' %}
+        {%- set sls_config_daemon = tplroot ~ '.software.config.daemon' %}
         {%- set sls_config_file = tplroot ~ '.software.config.file' %}
         {%- set sls_archive = tplroot ~ '.software.archive.install' %}
         {%- set sls_desktop = tplroot ~ '.software.desktop.install' %}
@@ -14,6 +15,7 @@
 include:
   - {{ sls_archive if d.pkg.docker.use_upstream == 'archive' else sls_desktop if d.pkg.docker.use_upstream == 'desktop' else sls_package }}
   - {{ sls_config_file }}
+  - {{ sls_config_daemon }}
 
         {%- if grains.kernel|lower == 'linux' %}
 
@@ -23,8 +25,9 @@ include:
     - onlyif: systemctl list-unit-files | grep {{ d.pkg.docker.service.name }} >/dev/null 2>&1
     - require_in:
       - service: {{ formula }}-software-service-running-docker
-            {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
     - require:
+      - sls: {{ sls_config_daemon }}
+            {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
       - sls: {{ sls_config_file }}
             {%- endif %}
             {%- if d.misc.firewall %}
@@ -38,11 +41,15 @@ include:
 {{ formula }}-software-service-running-docker:
   service.running:
     - name: {{ d.pkg.docker.service.name }}
-        {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
     - require:
+      - sls: {{ sls_config_daemon }}
+        {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
       - sls: {{ sls_config_file }}
         {%- endif %}
     - enable: True
+    - watch:
+      - file: {{ formula }}-software-daemon-file-managed-daemon_file
+
         {%- if grains.kernel|lower == 'linux' %}
 
 {{ formula }}-software-service-running-docker-fail-notify:
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
@@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
      - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 115
+     - 117
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 67
+     - 74
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1121702?v=4' width='36' height='36' alt='@cdarwin'>`
      - `@cdarwin <https://github.com/cdarwin>`_
      - 25
@@ -37,6 +37,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/175579?v=4' width='36' height='36' alt='@vladvasiliu'>`
      - `@vladvasiliu <https://github.com/vladvasiliu>`_
      - 12
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10724315?v=4' width='36' height='36' alt='@danny-smit'>`
+     - `@danny-smit <https://github.com/danny-smit>`_
+     - 9
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
      - `@nmadhok <https://github.com/nmadhok>`_
      - 9
@@ -179,4 +182,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-04-23.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-06-02.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
diff --git a/docs/CONTRIBUTING_DOCS.rst b/docs/CONTRIBUTING_DOCS.rst
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/kitchen.yml b/kitchen.yml
diff --git a/test/salt/pillar/repo.sls b/test/salt/pillar/repo.sls
