Merge pull request #389 from singularityhub/fix/docker-requirement-bug

docker: bug that docker is required for using podman

Author: vsoch

CHANGELOG.md

@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pip. Only major versions will be released as tags on Github.
 
 ## [0.0.x](https://github.scom/singularityhub/singularity-hpc/tree/master) (0.0.x)
+ - Cleanup of module files and docker requirement bugfix (0.0.27)
  - Docker support (0.0.26)
    - added an enable_tty setting to allow disabling add -t in recipes
    - enforced not adding extra settings to setting.yml

shpc/main/container/docker.py

@@ -25,8 +25,11 @@ class DockerContainer(ContainerTechnology):
     features = {}
 
     def __init__(self):
-        if shpc.utils.which("docker")["return_code"] != 0:
-            logger.exit("Docker is required to use the 'docker' base.")
+        if shpc.utils.which(self.command)["return_code"] != 0:
+            logger.exit(
+                "%s is required to use the '%s' base."
+                % (self.command.capitalize(), self.command)
+            )
         super(DockerContainer, self).__init__()
 
     def shell(self, image):

shpc/main/container/podman.py

@@ -3,10 +3,7 @@
 __license__ = "MPL 2.0"
 
 
-from shpc.logger import logger
 from .docker import DockerContainer
-import shpc.main.templates
-import shpc.utils
 
 import os
 
@@ -20,11 +17,6 @@ class PodmanContainer(DockerContainer):
     templatefile = "docker"
     command = "podman"
 
-    def __init__(self):
-        if shpc.utils.which("podman")["return_code"] != 0:
-            logger.exit("podman is required to use the podman base.")
-        super(PodmanContainer, self).__init__()
-
     def shell(self, image):
         """
         Interactive shell into a container image.

shpc/version.py

@@ -2,7 +2,7 @@
 __copyright__ = "Copyright 2021, Vanessa Sochat"
 __license__ = "MPL 2.0"
 
-__version__ = "0.0.26"
+__version__ = "0.0.27"
 AUTHOR = "Vanessa Sochat"
 NAME = "singularity-hpc"
 PACKAGE_URL = "https://github.com/singularityhub/singularity-hpc"