Skip to content

Commit d8445c6

Browse files
authored
Merge pull request #873 from puppetlabs/release-prep
Release prep v6.0.0
2 parents f008965 + 36f9e29 commit d8445c6

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

CHANGELOG.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,30 @@
22

33
All notable changes to this project will be documented in this file. 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).
44

5-
## [v5.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v5.1.0) - 2022-10-19
5+
## [v6.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v6.0.0) (2022-11-21)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v5.1.0...v6.0.0)
8+
9+
### Changed
10+
11+
- \(CONT-263\) Bumping required puppet version [\#871](https://github.com/puppetlabs/puppetlabs-docker/pull/871) ([LukasAud](https://github.com/LukasAud))
12+
- docker\_run\_flags: Shellescape any provided values [\#869](https://github.com/puppetlabs/puppetlabs-docker/pull/869) ([LukasAud](https://github.com/LukasAud))
13+
- \(maint\) Hardening manifests and tasks [\#863](https://github.com/puppetlabs/puppetlabs-docker/pull/863) ([LukasAud](https://github.com/LukasAud))
14+
15+
## [v5.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v5.1.0) (2022-10-21)
616

717
[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v5.0.0...v5.1.0)
818

919
### Added
1020

11-
- Add missing extra_systemd_parameters values to docker-run.erb [#851](https://github.com/puppetlabs/puppetlabs-docker/pull/851) ([cbowman0](https://github.com/cbowman0))
21+
- Add missing extra\_systemd\_parameters values to docker-run.erb [\#851](https://github.com/puppetlabs/puppetlabs-docker/pull/851) ([cbowman0](https://github.com/cbowman0))
1222

1323
### Fixed
1424

15-
- pdksync - (CONT-130) Dropping Support for Debian 9 [#859](https://github.com/puppetlabs/puppetlabs-docker/pull/859) ([jordanbreen28](https://github.com/jordanbreen28))
16-
- Change `stop_wait_time` value to match Docker default [#858](https://github.com/puppetlabs/puppetlabs-docker/pull/858) ([sebcdri](https://github.com/sebcdri))
25+
- pdksync - \(CONT-130\) Dropping Support for Debian 9 [\#859](https://github.com/puppetlabs/puppetlabs-docker/pull/859) ([jordanbreen28](https://github.com/jordanbreen28))
26+
- Change `stop_wait_time` value to match Docker default [\#858](https://github.com/puppetlabs/puppetlabs-docker/pull/858) ([sebcdri](https://github.com/sebcdri))
1727

18-
## [v5.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v5.0.0) (2022-08-18)
28+
## [v5.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v5.0.0) (2022-08-19)
1929

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

REFERENCE.md

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

5454
### Functions
5555

56+
* [`docker::escape`](#dockerescape)
5657
* [`docker::sanitised_name`](#dockersanitised_name): == Function: docker::sanitised_name Function to sanitise container name. === Parameters [*name*] Name to sanitise
5758
* [`docker_exec_flags`](#docker_exec_flags): Transforms a hash into a string of docker exec flags
5859
* [`docker_params_changed`](#docker_params_changed)
@@ -3386,7 +3387,7 @@ Data type: `Integer`
33863387

33873388

33883389

3389-
Default value: `0`
3390+
Default value: `10`
33903391

33913392
##### <a name="syslog_identifier"></a>`syslog_identifier`
33923393

@@ -4150,6 +4151,18 @@ usually discover the appropriate provider for your platform.
41504151

41514152
## Functions
41524153

4154+
### <a name="dockerescape"></a>`docker::escape`
4155+
4156+
Type: Ruby 3.x API
4157+
4158+
The docker::escape function.
4159+
4160+
#### `docker::escape()`
4161+
4162+
The docker::escape function.
4163+
4164+
Returns: `Any`
4165+
41534166
### <a name="dockersanitised_name"></a>`docker::sanitised_name`
41544167

41554168
Type: Puppet Language
@@ -4428,7 +4441,7 @@ Number of replicas
44284441

44294442
##### `expose`
44304443

4431-
Data type: `Variant[String,Array,Undef]`
4444+
Data type: `Variant[Array,Undef]`
44324445

44334446
Publish service ports externally to the swarm
44344447

@@ -4440,7 +4453,7 @@ Set environment variables
44404453

44414454
##### `command`
44424455

4443-
Data type: `Variant[String,Array,Undef]`
4456+
Data type: `Variant[Array,Undef]`
44444457

44454458
Command to run on the container
44464459

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": "5.1.0",
3+
"version": "6.0.0",
44
"author": "puppetlabs",
55
"summary": "Module for installing and managing docker",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)