Merge pull request #978 from puppetlabs/release-prep

Release prep v10.0.0

CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [v10.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v10.0.0) - 2024-07-04
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v9.1.0...v10.0.0)
+
+### Changed
+
+- Use the docker-compose-plugin via 'docker compose' instead of 'docker-compose' [#975](https://github.com/puppetlabs/puppetlabs-docker/pull/975) ([nathanlcarlson](https://github.com/nathanlcarlson))
+
+### Fixed
+
+- (CAT-1143)-Conversion_of_erb_templates_to_epp [#944](https://github.com/puppetlabs/puppetlabs-docker/pull/944) ([praj1001](https://github.com/praj1001))
+
 ## [v9.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v9.1.0) - 2023-07-19
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v9.0.1...v9.1.0)
@@ -25,18 +37,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v7.0.0...v8.0.0)
 
+### Changed
+
+- pdksync - (MAINT) - Require Stdlib 9.x [#921](https://github.com/puppetlabs/puppetlabs-docker/pull/921) ([LukasAud](https://github.com/LukasAud))
+
 ### Added
 
 - (CONT-1121) - Add support for CentOS 8 [#926](https://github.com/puppetlabs/puppetlabs-docker/pull/926) ([jordanbreen28](https://github.com/jordanbreen28))
 
-### Changed
-- pdksync - (MAINT) - Require Stdlib 9.x [#921](https://github.com/puppetlabs/puppetlabs-docker/pull/921) ([LukasAud](https://github.com/LukasAud))
-
 ## [v7.0.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v7.0.0) - 2023-05-02
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v6.1.0...v7.0.0)
 
 ### Changed
+
 - (CONT-776) - Add Puppet 8/Drop Puppet 6 [#910](https://github.com/puppetlabs/puppetlabs-docker/pull/910) ([jordanbreen28](https://github.com/jordanbreen28))
 
 ## [v6.1.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v6.1.0) - 2023-04-28
@@ -73,6 +87,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v5.1.0...v6.0.0)
 
 ### Changed
+
 - (CONT-263) Bumping required puppet version [#871](https://github.com/puppetlabs/puppetlabs-docker/pull/871) ([LukasAud](https://github.com/LukasAud))
 - docker_run_flags: Shellescape any provided values [#869](https://github.com/puppetlabs/puppetlabs-docker/pull/869) ([LukasAud](https://github.com/LukasAud))
 - (maint) Hardening manifests and tasks [#863](https://github.com/puppetlabs/puppetlabs-docker/pull/863) ([LukasAud](https://github.com/LukasAud))
@@ -94,13 +109,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v4.4.0...v5.0.0)
 
+### Changed
+
+- Remove log_driver limitations [#792](https://github.com/puppetlabs/puppetlabs-docker/pull/792) ([timdeluxe](https://github.com/timdeluxe))
+
 ### Added
 
 - pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04 [#850](https://github.com/puppetlabs/puppetlabs-docker/pull/850) ([david22swan](https://github.com/david22swan))
 - adding optional variable for package_key_check_source to RedHat [#846](https://github.com/puppetlabs/puppetlabs-docker/pull/846) ([STaegtmeier](https://github.com/STaegtmeier))
-
-### Changed
-- Remove log_driver limitations [#792](https://github.com/puppetlabs/puppetlabs-docker/pull/792) ([timdeluxe](https://github.com/timdeluxe))
+- New create_user parameter on main class [#841](https://github.com/puppetlabs/puppetlabs-docker/pull/841) ([traylenator](https://github.com/traylenator))
 
 ## [v4.4.0](https://github.com/puppetlabs/puppetlabs-docker/tree/v4.4.0) - 2022-06-01
 
@@ -209,6 +226,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/v3.13.1...v3.14.0)
 
 ### Changed
+
 - pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#718](https://github.com/puppetlabs/puppetlabs-docker/pull/718) ([carabasdaniel](https://github.com/carabasdaniel))
 
 ### Fixed
@@ -285,7 +303,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - (MODULES-10691) - Add root_dir in daemon.json [#632](https://github.com/puppetlabs/puppetlabs-docker/pull/632) ([daianamezdrea](https://github.com/daianamezdrea))
 - 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))
-- Blocking ordering between non-Windows service stops [#622](https://github.com/puppetlabs/puppetlabs-docker/pull/622) ([ALTinners](https://github.com/ALTinners))
+- Blocking ordering between non-Windows service stops [#622](https://github.com/puppetlabs/puppetlabs-docker/pull/622) ([AndrewLipscomb](https://github.com/AndrewLipscomb))
 - Allow all 3.x docker-compose minor versions [#620](https://github.com/puppetlabs/puppetlabs-docker/pull/620) ([runejuhl](https://github.com/runejuhl))
 
 ## [v3.10.1](https://github.com/puppetlabs/puppetlabs-docker/tree/v3.10.1) - 2020-05-28
@@ -388,15 +406,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-docker/compare/3.5.0...v3.6.0)
 
+### Changed
+
+- (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))
+
 ### Added
 
 - (FM-8151) Add Windows Server 2019 support [#493](https://github.com/puppetlabs/puppetlabs-docker/pull/493) ([eimlav](https://github.com/eimlav))
 - Support for docker machine download and install [#466](https://github.com/puppetlabs/puppetlabs-docker/pull/466) ([acurus-puppetmaster](https://github.com/acurus-puppetmaster))
 - Add service_provider parameter to docker::run [#376](https://github.com/puppetlabs/puppetlabs-docker/pull/376) ([jameslikeslinux](https://github.com/jameslikeslinux))
 
-### Changed
-- (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))
-
 ### Fixed
 
 - Tasks frozen string [#499](https://github.com/puppetlabs/puppetlabs-docker/pull/499) ([khaefeli](https://github.com/khaefeli))

REFERENCE.md

@@ -53,6 +53,7 @@ from the registry
 
 ### Functions
 
+* [`docker::env`](#docker--env)
 * [`docker::escape`](#docker--escape)
 * [`docker::sanitised_name`](#docker--sanitised_name): == Function: docker::sanitised_name  Function to sanitise container name.  === Parameters  [*name*]   Name to sanitise
 * [`docker_exec_flags`](#docker_exec_flags): Transforms a hash into a string of docker exec flags
@@ -1252,12 +1253,6 @@ The following parameters are available in the `docker::compose` class:
 
 * [`ensure`](#-docker--compose--ensure)
 * [`version`](#-docker--compose--version)
-* [`install_path`](#-docker--compose--install_path)
-* [`symlink_name`](#-docker--compose--symlink_name)
-* [`proxy`](#-docker--compose--proxy)
-* [`base_url`](#-docker--compose--base_url)
-* [`raw_url`](#-docker--compose--raw_url)
-* [`curl_ensure`](#-docker--compose--curl_ensure)
 
 ##### <a name="-docker--compose--ensure"></a>`ensure`
 
@@ -1274,63 +1269,8 @@ Data type: `Optional[String]`
 
 The version of Docker Compose to install.
 
-Default value: `$docker::params::compose_version`
-
-##### <a name="-docker--compose--install_path"></a>`install_path`
-
-Data type: `Optional[String]`
-
-The path where to install Docker Compose.
-
-Default value: `$docker::params::compose_install_path`
-
-##### <a name="-docker--compose--symlink_name"></a>`symlink_name`
-
-Data type: `Optional[String]`
-
-The name of the symlink created pointing to the actual docker-compose binary
-This allows use of own docker-compose wrapper scripts for the times it's
-necessary to set certain things before running the docker-compose binary
-
-Default value: `$docker::params::compose_symlink_name`
-
-##### <a name="-docker--compose--proxy"></a>`proxy`
-
-Data type: `Optional[String]`
-
-Proxy to use for downloading Docker Compose.
-
-Default value: `undef`
-
-##### <a name="-docker--compose--base_url"></a>`base_url`
-
-Data type: `Optional[String]`
-
-The base url for installation
-This allows use of a mirror that follows the same layout as the
-official repository
-
-Default value: `$docker::params::compose_base_url`
-
-##### <a name="-docker--compose--raw_url"></a>`raw_url`
-
-Data type: `Optional[String]`
-
-Override the raw URL for installation
-The default is to build a URL from baseurl. If rawurl is set, the caller is
-responsible for ensuring the URL points to the correct version and
-architecture.
-
 Default value: `undef`
 
-##### <a name="-docker--compose--curl_ensure"></a>`curl_ensure`
-
-Data type: `Optional[Boolean]`
-
-Whether or not the curl package is ensured by this module.
-
-Default value: `$docker::params::curl_ensure`
-
 ### <a name="docker--images"></a>`docker::images`
 
 The docker::images class.
@@ -1453,7 +1393,7 @@ Default value: `$docker::params::machine_install_path`
 
 ##### <a name="-docker--machine--proxy"></a>`proxy`
 
-Data type: `Optional[String]`
+Data type: `Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']]`
 
 Proxy to use for downloading Docker Machine.
 
@@ -4137,6 +4077,24 @@ usually discover the appropriate provider for your platform.
 
 ## Functions
 
+### <a name="docker--env"></a>`docker::env`
+
+Type: Ruby 4.x API
+
+The docker::env function.
+
+#### `docker::env(Array $args)`
+
+The docker::env function.
+
+Returns: `Array`
+
+##### `args`
+
+Data type: `Array`
+
+
+
 ### <a name="docker--escape"></a>`docker::escape`
 
 Type: Ruby 3.x API

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-docker",
-  "version": "9.1.0",
+  "version": "10.0.0",
   "author": "puppetlabs",
   "summary": "Module for installing and managing docker",
   "license": "Apache-2.0",