File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change 79
79
})
80
80
81
81
$exec_install = " ${docker_command} install ${docker_plugin_install_flags} "
82
- $unless_install = " ${docker_command} ls | grep -w ${plugin_name} "
82
+ $unless_install = " ${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name} "
83
83
84
84
exec { "plugin install ${plugin_name}" :
85
85
command => $exec_install ,
95
95
})
96
96
97
97
$exec_rm = " ${docker_command} rm ${docker_plugin_remove_flags} "
98
- $onlyif_rm = " ${docker_command} ls | grep -w ${plugin_name} "
98
+ $onlyif_rm = " ${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name} "
99
99
100
100
exec { "plugin remove ${plugin_name}" :
101
101
command => $exec_rm ,
109
109
if $enabled {
110
110
$docker_plugin_enable_flags = docker_plugin_enable_flags({
111
111
plugin_name => $plugin_name ,
112
+ plugin_alias => $plugin_alias ,
112
113
timeout => $timeout ,
113
114
})
114
115
115
116
$exec_enable = " ${docker_command} enable ${docker_plugin_enable_flags} "
116
- $onlyif_enable = " ${docker_command} ls -f enabled=false | grep -w ${plugin_name} "
117
+ $onlyif_enable = " ${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name} "
117
118
118
119
exec { "plugin enable ${plugin_name}" :
119
120
command => $exec_enable ,
129
130
environment => ' HOME=/root' ,
130
131
path => [' /bin' , ' /usr/bin' ],
131
132
timeout => 0,
132
- unless => " ${docker_command} ls -f enabled=false | grep -w ${plugin_name} " ,
133
+ unless => " ${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name} " ,
133
134
}
134
135
}
135
136
}
You can’t perform that action at this time.
0 commit comments