Browse Source

Merge "container-puppet: run podman rm with --storage" into stable/stein

tags/10.6.1
Zuul 1 week ago
parent
commit
1899678b1b
1 changed files with 8 additions and 1 deletions
  1. 8
    1
      common/container-puppet.py

+ 8
- 1
common/container-puppet.py View File

@@ -173,7 +173,14 @@ def rm_container(name):
173 173
             log.debug(cmd_stderr)
174 174
 
175 175
     log.info('Removing container: %s' % name)
176
-    subproc = subprocess.Popen([cli_cmd, 'rm', name],
176
+    rm_cli_cmd = [cli_cmd, 'rm']
177
+    # --storage is used as a mitigation of
178
+    # https://github.com/containers/libpod/issues/3906
179
+    # Also look https://bugzilla.redhat.com/show_bug.cgi?id=1747885
180
+    if container_cli == 'podman':
181
+        rm_cli_cmd.extend(['--storage'])
182
+    rm_cli_cmd.append(name)
183
+    subproc = subprocess.Popen(rm_cli_cmd,
177 184
                                stdout=subprocess.PIPE,
178 185
                                stderr=subprocess.PIPE,
179 186
                                universal_newlines=True)

Loading…
Cancel
Save