Skip to content

Commit 94e6c03

Browse files
author
GitHub Actions
committed
Release prep v9.2.0
1 parent 8f4b3d9 commit 94e6c03

File tree

3 files changed

+41
-13
lines changed

3 files changed

+41
-13
lines changed

CHANGELOG.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55

66
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
77

8+
## [v9.2.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v9.2.0) - 2024-05-02
9+
10+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v9.1.0...v9.2.0)
11+
12+
### Fixed
13+
14+
- (CAT-1143)-Conversion_of_erb_templates_to_epp [#944](https://github.com/puppetlabs/puppetlabs-docker/pull/944) ([praj1001](https://github.com/praj1001))
15+
816
## [v9.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v9.1.0) - 2023-07-19
917

1018
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v9.0.1...v9.1.0)
@@ -25,13 +33,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
2533

2634
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v7.0.0...v8.0.0)
2735

36+
### Changed
37+
- pdksync - (MAINT) - Require Stdlib 9.x [#921](https://github.com/puppetlabs/puppetlabs-docker/pull/921) ([LukasAud](https://github.com/LukasAud))
38+
2839
### Added
2940

3041
- (CONT-1121) - Add support for CentOS 8 [#926](https://github.com/puppetlabs/puppetlabs-docker/pull/926) ([jordanbreen28](https://github.com/jordanbreen28))
3142

32-
### Changed
33-
- pdksync - (MAINT) - Require Stdlib 9.x [#921](https://github.com/puppetlabs/puppetlabs-docker/pull/921) ([LukasAud](https://github.com/LukasAud))
34-
3543
## [v7.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v7.0.0) - 2023-05-02
3644

3745
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v6.1.0...v7.0.0)
@@ -94,13 +102,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
94102

95103
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v4.4.0...v5.0.0)
96104

105+
### Changed
106+
- Remove log_driver limitations [#792](https://github.com/puppetlabs/puppetlabs-docker/pull/792) ([timdeluxe](https://github.com/timdeluxe))
107+
97108
### Added
98109

99110
- pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04 [#850](https://github.com/puppetlabs/puppetlabs-docker/pull/850) ([david22swan](https://github.com/david22swan))
100111
- adding optional variable for package_key_check_source to RedHat [#846](https://github.com/puppetlabs/puppetlabs-docker/pull/846) ([STaegtmeier](https://github.com/STaegtmeier))
101-
102-
### Changed
103-
- Remove log_driver limitations [#792](https://github.com/puppetlabs/puppetlabs-docker/pull/792) ([timdeluxe](https://github.com/timdeluxe))
112+
- New create_user parameter on main class [#841](https://github.com/puppetlabs/puppetlabs-docker/pull/841) ([traylenator](https://github.com/traylenator))
104113

105114
## [v4.4.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v4.4.0) - 2022-06-01
106115

@@ -285,7 +294,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
285294

286295
- (MODULES-10691) - Add root_dir in daemon.json [#632](https://github.com/puppetlabs/puppetlabs-docker/pull/632) ([daianamezdrea](https://github.com/daianamezdrea))
287296
- Fixing the fix 'Fix the docker_compose options parameter position #378' [#631](https://github.com/puppetlabs/puppetlabs-docker/pull/631) ([awegmann](https://github.com/awegmann))
288-
- Blocking ordering between non-Windows service stops [#622](https://github.com/puppetlabs/puppetlabs-docker/pull/622) ([ALTinners](https://github.com/ALTinners))
297+
- Blocking ordering between non-Windows service stops [#622](https://github.com/puppetlabs/puppetlabs-docker/pull/622) ([AndrewLipscomb](https://github.com/AndrewLipscomb))
289298
- Allow all 3.x docker-compose minor versions [#620](https://github.com/puppetlabs/puppetlabs-docker/pull/620) ([runejuhl](https://github.com/runejuhl))
290299

291300
## [v3.10.1](https://github.com/puppetlabs/puppetlabs-docker/tree/v3.10.1) - 2020-05-28
@@ -388,15 +397,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
388397

389398
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/3.5.0...v3.6.0)
390399

400+
### Changed
401+
- (FM-8100) Update minimum supported Puppet version to 5.5.10 [#486](https://github.com/puppetlabs/puppetlabs-docker/pull/486) ([eimlav](https://github.com/eimlav))
402+
391403
### Added
392404

393405
- (FM-8151) Add Windows Server 2019 support [#493](https://github.com/puppetlabs/puppetlabs-docker/pull/493) ([eimlav](https://github.com/eimlav))
394406
- Support for docker machine download and install [#466](https://github.com/puppetlabs/puppetlabs-docker/pull/466) ([acurus-puppetmaster](https://github.com/acurus-puppetmaster))
395407
- Add service_provider parameter to docker::run [#376](https://github.com/puppetlabs/puppetlabs-docker/pull/376) ([jameslikeslinux](https://github.com/jameslikeslinux))
396408

397-
### Changed
398-
- (FM-8100) Update minimum supported Puppet version to 5.5.10 [#486](https://github.com/puppetlabs/puppetlabs-docker/pull/486) ([eimlav](https://github.com/eimlav))
399-
400409
### Fixed
401410

402411
- Tasks frozen string [#499](https://github.com/puppetlabs/puppetlabs-docker/pull/499) ([khaefeli](https://github.com/khaefeli))

REFERENCE.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ from the registry
5353

5454
### Functions
5555

56+
* [`docker::env`](#docker--env)
5657
* [`docker::escape`](#docker--escape)
5758
* [`docker::sanitised_name`](#docker--sanitised_name): == Function: docker::sanitised_name Function to sanitise container name. === Parameters [*name*] Name to sanitise
5859
* [`docker_exec_flags`](#docker_exec_flags): Transforms a hash into a string of docker exec flags
@@ -1296,7 +1297,7 @@ Default value: `$docker::params::compose_symlink_name`
12961297

12971298
##### <a name="-docker--compose--proxy"></a>`proxy`
12981299

1299-
Data type: `Optional[String]`
1300+
Data type: `Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']]`
13001301

13011302
Proxy to use for downloading Docker Compose.
13021303

@@ -1453,7 +1454,7 @@ Default value: `$docker::params::machine_install_path`
14531454

14541455
##### <a name="-docker--machine--proxy"></a>`proxy`
14551456

1456-
Data type: `Optional[String]`
1457+
Data type: `Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']]`
14571458

14581459
Proxy to use for downloading Docker Machine.
14591460

@@ -4137,6 +4138,24 @@ usually discover the appropriate provider for your platform.
41374138

41384139
## Functions
41394140

4141+
### <a name="docker--env"></a>`docker::env`
4142+
4143+
Type: Ruby 4.x API
4144+
4145+
The docker::env function.
4146+
4147+
#### `docker::env(Array $args)`
4148+
4149+
The docker::env function.
4150+
4151+
Returns: `Array`
4152+
4153+
##### `args`
4154+
4155+
Data type: `Array`
4156+
4157+
4158+
41404159
### <a name="docker--escape"></a>`docker::escape`
41414160

41424161
Type: Ruby 3.x API

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-docker",
3-
"version": "9.1.0",
3+
"version": "9.2.0",
44
"author": "puppetlabs",
55
"summary": "Module for installing and managing docker",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)