Skip to content

Commit

Permalink
Merge pull request puppetlabs#877 from gfargeas/main
Browse files Browse the repository at this point in the history
Use puppet yaml helper to workaround psych >4 breaking changes
  • Loading branch information
pmcmaw authored Feb 2, 2023
2 parents 781f4f2 + ad87060 commit 35f9d90
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/puppet/provider/docker_compose/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def exists?

# get merged config using docker-compose config
args = [compose_files, '-p', name, 'config'].insert(3, resource[:options]).compact
compose_output = YAML.safe_load(execute([command(:dockercompose)] + args, combine: false), [Symbol])
compose_output = Puppet::Util::Yaml.safe_load(execute([command(:dockercompose)] + args, combine: false), [Symbol])

containers = docker([
'ps',
Expand Down

0 comments on commit 35f9d90

Please sign in to comment.