Skip to content

Commit 3c2ee22

Browse files
chore(release): 2.4.0 [skip ci]
# [2.4.0](v2.3.1...v2.4.0) (2022-02-10) ### Bug Fixes * **centos:** modify repository url ([55ff30a](55ff30a)) * **debian:** remove repository using `file` instead of `pkgrepo` ([28ea2f9](28ea2f9)) * **dependencies:** add needed packages for Redhat's family members ([652da44](652da44)) * **repository:** amazonlinux repository url ([949551b](949551b)) ### Continuous Integration * **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([a1a5880](a1a5880)) * **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([caf640a](caf640a)) * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([141ae5e](141ae5e)) * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([e19468b](e19468b)) ### Features * **debian:** use repository keyring instead of key_id ([db49eba](db49eba)) ### Tests * **repository:** redhat's family alternatives for repo url ([410078c](410078c))
1 parent cbc7c17 commit 3c2ee22

File tree

5 files changed

+76
-19
lines changed

5 files changed

+76
-19
lines changed

AUTHORS.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord
44

55
Avatar|Contributor|Contributions
66
:-:|---|:-:
7-
<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)|124
8-
<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)|92
7+
<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)|126
8+
<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)|114
99
<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
10+
<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)|25
1011
<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
1112
<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
12-
<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
1313
<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
1414
<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
1515
<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
@@ -32,7 +32,6 @@ Avatar|Contributor|Contributions
3232
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1806188?v=4' width='36' height='36' alt='@tedski'>|[@tedski](https://github.com/tedski)|2
3333
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12551470?v=4' width='36' height='36' alt='@tyhunt99'>|[@tyhunt99](https://github.com/tyhunt99)|2
3434
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/263432?v=4' width='36' height='36' alt='@DavidJFelix'>|[@DavidJFelix](https://github.com/DavidJFelix)|2
35-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5145555?v=4' width='36' height='36' alt='@scornelissen85'>|[@scornelissen85](https://github.com/scornelissen85)|2
3635
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|1
3736
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4754654?v=4' width='36' height='36' alt='@alinefr'>|[@alinefr](https://github.com/alinefr)|1
3837
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3441274?v=4' width='36' height='36' alt='@ernstae'>|[@ernstae](https://github.com/ernstae)|1
@@ -41,7 +40,6 @@ Avatar|Contributor|Contributions
4140
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1297771?v=4' width='36' height='36' alt='@ctr49'>|[@ctr49](https://github.com/ctr49)|1
4241
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|1
4342
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9766?v=4' width='36' height='36' alt='@blueyed'>|[@blueyed](https://github.com/blueyed)|1
44-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5060511?v=4' width='36' height='36' alt='@comozo'>|[@comozo](https://github.com/comozo)|1
4543
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/440033?v=4' width='36' height='36' alt='@JohnMaguire'>|[@JohnMaguire](https://github.com/JohnMaguire)|1
4644
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/459014?v=4' width='36' height='36' alt='@jstjohn'>|[@jstjohn](https://github.com/jstjohn)|1
4745
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1923178?v=4' width='36' height='36' alt='@jfrederickson'>|[@jfrederickson](https://github.com/jfrederickson)|1
@@ -53,6 +51,7 @@ Avatar|Contributor|Contributions
5351
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/438648?v=4' width='36' height='36' alt='@pwaller'>|[@pwaller](https://github.com/pwaller)|1
5452
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/476168?v=4' width='36' height='36' alt='@syndicut'>|[@syndicut](https://github.com/syndicut)|1
5553
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6969134?v=4' width='36' height='36' alt='@rgreinho'>|[@rgreinho](https://github.com/rgreinho)|1
54+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5145555?v=4' width='36' height='36' alt='@sanderc85'>|[@sanderc85](https://github.com/sanderc85)|1
5655
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3762852?v=4' width='36' height='36' alt='@tobias-m'>|[@tobias-m](https://github.com/tobias-m)|1
5756
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/903488?v=4' width='36' height='36' alt='@ghostsquad'>|[@ghostsquad](https://github.com/ghostsquad)|1
5857
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1388?v=4' width='36' height='36' alt='@greut'>|[@greut](https://github.com/greut)|1
@@ -63,4 +62,4 @@ Avatar|Contributor|Contributions
6362

6463
---
6564

66-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-09-09.
65+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-10.

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Changelog
22

3+
# [2.4.0](https://github.com/saltstack-formulas/docker-formula/compare/v2.3.1...v2.4.0) (2022-02-10)
4+
5+
6+
### Bug Fixes
7+
8+
* **centos:** modify repository url ([55ff30a](https://github.com/saltstack-formulas/docker-formula/commit/55ff30afb13abdb578dd37435f5c37b9670de748))
9+
* **debian:** remove repository using `file` instead of `pkgrepo` ([28ea2f9](https://github.com/saltstack-formulas/docker-formula/commit/28ea2f92e05f95123467ec0f29e3a79ff944c731))
10+
* **dependencies:** add needed packages for Redhat's family members ([652da44](https://github.com/saltstack-formulas/docker-formula/commit/652da448311d2935e3695e8ca5a0084c10fae38d))
11+
* **repository:** amazonlinux repository url ([949551b](https://github.com/saltstack-formulas/docker-formula/commit/949551b46306297f7be2064ebd87c65b5df5c155))
12+
13+
14+
### Continuous Integration
15+
16+
* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([a1a5880](https://github.com/saltstack-formulas/docker-formula/commit/a1a58804f560eb5a82c7b2c626f9b8d3f6b3d1a2))
17+
* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([caf640a](https://github.com/saltstack-formulas/docker-formula/commit/caf640ac724ef30f2b1b2d161bc3584db404e542))
18+
* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([141ae5e](https://github.com/saltstack-formulas/docker-formula/commit/141ae5e15dfe2acea1fd727593610fb39c1ddc60))
19+
* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([e19468b](https://github.com/saltstack-formulas/docker-formula/commit/e19468bc16e81431da398a84e91d635554defdb8))
20+
21+
22+
### Features
23+
24+
* **debian:** use repository keyring instead of key_id ([db49eba](https://github.com/saltstack-formulas/docker-formula/commit/db49ebaaacc09da13fbbde3fe1303957d157170f))
25+
26+
27+
### Tests
28+
29+
* **repository:** redhat's family alternatives for repo url ([410078c](https://github.com/saltstack-formulas/docker-formula/commit/410078c5f47da3dd52a45705175e719448cfb0a2))
30+
331
## [2.3.1](https://github.com/saltstack-formulas/docker-formula/compare/v2.3.0...v2.3.1) (2021-09-09)
432

533

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: docker
22
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
33
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4-
version: 2.3.1
4+
version: 2.4.0
55
release: 1
66
minimum_version: 2017.7
77
summary: docker formula

docs/AUTHORS.rst

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ This list is sorted by the number of commits per contributor in *descending* ord
1515
- Contributions
1616
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
1717
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
18-
- 124
18+
- 126
1919
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
2020
- `@myii <https://github.com/myii>`_
21-
- 92
21+
- 114
2222
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1121702?v=4' width='36' height='36' alt='@cdarwin'>`
2323
- `@cdarwin <https://github.com/cdarwin>`_
2424
- 25
25+
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
26+
- `@javierbertoli <https://github.com/javierbertoli>`_
27+
- 25
2528
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
2629
- `@gravyboat <https://github.com/gravyboat>`_
2730
- 22
2831
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
2932
- `@aboe76 <https://github.com/aboe76>`_
3033
- 21
31-
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
32-
- `@javierbertoli <https://github.com/javierbertoli>`_
33-
- 18
3434
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
3535
- `@puneetk <https://github.com/puneetk>`_
3636
- 15
@@ -97,9 +97,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
9797
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/263432?v=4' width='36' height='36' alt='@DavidJFelix'>`
9898
- `@DavidJFelix <https://github.com/DavidJFelix>`_
9999
- 2
100-
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5145555?v=4' width='36' height='36' alt='@scornelissen85'>`
101-
- `@scornelissen85 <https://github.com/scornelissen85>`_
102-
- 2
103100
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
104101
- `@alxwr <https://github.com/alxwr>`_
105102
- 1
@@ -124,9 +121,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
124121
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9766?v=4' width='36' height='36' alt='@blueyed'>`
125122
- `@blueyed <https://github.com/blueyed>`_
126123
- 1
127-
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5060511?v=4' width='36' height='36' alt='@comozo'>`
128-
- `@comozo <https://github.com/comozo>`_
129-
- 1
130124
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/440033?v=4' width='36' height='36' alt='@JohnMaguire'>`
131125
- `@JohnMaguire <https://github.com/JohnMaguire>`_
132126
- 1
@@ -160,6 +154,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
160154
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6969134?v=4' width='36' height='36' alt='@rgreinho'>`
161155
- `@rgreinho <https://github.com/rgreinho>`_
162156
- 1
157+
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5145555?v=4' width='36' height='36' alt='@sanderc85'>`
158+
- `@sanderc85 <https://github.com/sanderc85>`_
159+
- 1
163160
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3762852?v=4' width='36' height='36' alt='@tobias-m'>`
164161
- `@tobias-m <https://github.com/tobias-m>`_
165162
- 1
@@ -185,4 +182,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
185182

186183
----
187184

188-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-09-09.
185+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-02-10.

docs/CHANGELOG.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,39 @@
22
Changelog
33
=========
44

5+
`2.4.0 <https://github.com/saltstack-formulas/docker-formula/compare/v2.3.1...v2.4.0>`_ (2022-02-10)
6+
--------------------------------------------------------------------------------------------------------
7+
8+
Bug Fixes
9+
^^^^^^^^^
10+
11+
12+
* **centos:** modify repository url (\ `55ff30a <https://github.com/saltstack-formulas/docker-formula/commit/55ff30afb13abdb578dd37435f5c37b9670de748>`_\ )
13+
* **debian:** remove repository using ``file`` instead of ``pkgrepo`` (\ `28ea2f9 <https://github.com/saltstack-formulas/docker-formula/commit/28ea2f92e05f95123467ec0f29e3a79ff944c731>`_\ )
14+
* **dependencies:** add needed packages for Redhat's family members (\ `652da44 <https://github.com/saltstack-formulas/docker-formula/commit/652da448311d2935e3695e8ca5a0084c10fae38d>`_\ )
15+
* **repository:** amazonlinux repository url (\ `949551b <https://github.com/saltstack-formulas/docker-formula/commit/949551b46306297f7be2064ebd87c65b5df5c155>`_\ )
16+
17+
Continuous Integration
18+
^^^^^^^^^^^^^^^^^^^^^^
19+
20+
21+
* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `a1a5880 <https://github.com/saltstack-formulas/docker-formula/commit/a1a58804f560eb5a82c7b2c626f9b8d3f6b3d1a2>`_\ )
22+
* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `caf640a <https://github.com/saltstack-formulas/docker-formula/commit/caf640ac724ef30f2b1b2d161bc3584db404e542>`_\ )
23+
* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `141ae5e <https://github.com/saltstack-formulas/docker-formula/commit/141ae5e15dfe2acea1fd727593610fb39c1ddc60>`_\ )
24+
* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `e19468b <https://github.com/saltstack-formulas/docker-formula/commit/e19468bc16e81431da398a84e91d635554defdb8>`_\ )
25+
26+
Features
27+
^^^^^^^^
28+
29+
30+
* **debian:** use repository keyring instead of key_id (\ `db49eba <https://github.com/saltstack-formulas/docker-formula/commit/db49ebaaacc09da13fbbde3fe1303957d157170f>`_\ )
31+
32+
Tests
33+
^^^^^
34+
35+
36+
* **repository:** redhat's family alternatives for repo url (\ `410078c <https://github.com/saltstack-formulas/docker-formula/commit/410078c5f47da3dd52a45705175e719448cfb0a2>`_\ )
37+
538
`2.3.1 <https://github.com/saltstack-formulas/docker-formula/compare/v2.3.0...v2.3.1>`_ (2021-09-09)
639
--------------------------------------------------------------------------------------------------------
740

0 commit comments

Comments
 (0)