Merge pull request #1082 from vantage6/bugfix/prevent-error-when-remo…

…ving-docker-volumes

Prevent error when volume that normally exists doesn't exist when shu…

vantage6-common/vantage6/common/docker/addons.py

@@ -518,10 +518,9 @@ def delete_volume_if_exists(client: docker.DockerClient, volume_name: Volume) ->
     volume: Volume
         Volume to delete
     """
-    # get docker volume from name
-    volume = client.volumes.get(volume_name)
-    if volume:
-        try:
+    try:
+        volume = client.volumes.get(volume_name)
+        if volume:
             volume.remove()
-        except (docker.errors.NotFound, docker.errors.APIError):
-            log.warning("Could not delete volume %s", volume.name)
+    except (docker.errors.NotFound, docker.errors.APIError):
+        log.warning("Could not delete volume %s", volume.name)