Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Defaults memory_limit to undef instead of ignored 0b value #928

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3065,11 +3065,11 @@ Default value: `undef`

##### <a name="-docker--run--memory_limit"></a>`memory_limit`

Data type: `Pattern[/^[\d]*(b|k|m|g)$/]`
Data type: `Optional[Pattern[/^[\d]*(b|k|m|g)$/]]`



Default value: `'0b'`
Default value: `undef`

##### <a name="-docker--run--cpuset"></a>`cpuset`

Expand Down
6 changes: 3 additions & 3 deletions manifests/run.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
# puppet help.
#
# @param verify_digest
# (optional) Make sure, that the image has not modified. Compares the digest
# (optional) Make sure, that the image has not modified. Compares the digest
# checksum before starting the docker image.
# To get the digest of an image, run the following command:
# To get the digest of an image, run the following command:
# docker image inspect <<image>> --format='{{index .RepoDigests 0}}
#
# @param service_prefix
Expand Down Expand Up @@ -196,7 +196,7 @@
Enum[present,absent] $ensure = 'present',
Optional[String] $verify_digest = undef,
Optional[String] $command = undef,
Pattern[/^[\d]*(b|k|m|g)$/] $memory_limit = '0b',
Optional[Pattern[/^[\d]*(b|k|m|g)$/]] $memory_limit = undef,
Variant[String,Array,Undef] $cpuset = [],
Variant[String,Array,Undef] $ports = [],
Variant[String,Array,Undef] $labels = [],
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/run_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
'links' => [],
'lxc_conf' => [],
'manage_service' => true,
'memory_limit' => '0b',
'memory_limit' => :undef,
'net' => 'bridge',
'ports' => [],
'privileged' => false,
Expand Down