install: add new option --runtime=PATH to choose the OCI runtime

it is supported by system and user containers.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1125
Approved by: TomSweeneyRedHat

Author: giuseppe

Atomic/install.py

@@ -67,6 +67,8 @@ def cli(subparser):
                                      help=_('install a system container'))
         installp.add_argument("--system-package", dest="system_package", default="auto",
                               help=_('control how to install the package.  It accepts `auto`, `yes`, `no`, `build`'))
+        installp.add_argument("--runtime", dest="runtime", default=None,
+                              help=_('specify the OCI runtime to use for system and user containers'))
         installp.add_argument("--rootfs", dest="remote",
                               help=_("choose an existing exploded container/image to use "
                                      "its rootfs as a remote, read-only rootfs for the "

Atomic/syscontainers.py

@@ -83,7 +83,8 @@ def __init__(self):
         self.args = None
         self.setvalues = None
         self.display = False
-        self._runtime = None
+        self.runtime = None
+        self._runtime_from_info_file = None
 
     def get_atomic_config_item(self, config_item):
         """
@@ -148,6 +149,11 @@ def set_args(self, args):
         except (NameError, AttributeError):
             pass
 
+        try:
+            self.runtime = self.args.runtime
+        except (NameError, AttributeError):
+            pass
+
     @staticmethod
     def _split_set_args(setvalues):
         values = {}
@@ -468,8 +474,11 @@ def _generate_default_oci_configuration(self, destination):
             conf.write(json.dumps(configuration, indent=4))
 
     def _get_oci_runtime(self):
-        if self._runtime:
-            return self._runtime
+        if self.runtime:
+            return self.runtime
+
+        if self._runtime_from_info_file:
+            return self._runtime_from_info_file
 
         if self.user:
             return util.BWRAP_OCI_PATH
@@ -1094,7 +1103,7 @@ def update_container(self, name, setvalues=None, rebase=None):
             return
 
         if runtime is not None:
-            self._runtime = runtime
+            self._runtime_from_info_file = runtime
         if system_package is None:
             system_package = 'yes' if rpm_installed else 'no'
         self._checkout(repo, name, image, next_deployment, True, values, remote=self.args.remote, installed_files=installed_files, system_package=system_package)

bash/atomic

@@ -721,6 +721,7 @@ _atomic_install() {
 		--help
 	       --display
 	       --rootfs
+	       --runtime
 	       --storage
 	       --system
 	       --system-package

docs/atomic-install.1.md

@@ -70,6 +70,12 @@ root filesystem. The existing rootfs will be used as the new
 system container's rootfs (read only), and thus the new container
 will only contain config and info files.
 
+**--runtime=PATH**
+Change the OCI runtime used by the systemd service file for running
+system containers and user containers.  The default **/bin/runc** is
+used for system containers.  Conversely, for user containers the
+default value is **/bin/bwrap-oci**.
+
 **--set=NAME=VALUE**
 Set a value that is going to be used by a system container for its
 configuration and can be specified multiple times.  It is used only

tests/integration/test_system_containers_runtime.sh

@@ -15,6 +15,7 @@ IFS=$'\n\t'
 # 8. Repeated updates/rollbacks
 # 9. Update --rebase
 # 10. Updating/rolling back a container with a remote rootfs
+# 11. Verify --runtime is honored
 
 setup () {
     ${ATOMIC} pull --storage ostree docker:atomic-test-system:latest
@@ -229,3 +230,8 @@ assert_matches "new-receiver" ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}-new/config.
 
 ${ATOMIC} containers rollback ${NAME}-new
 assert_matches ${SECRET} ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}-new/config.json
+
+# 11. Test --runtime
+${ATOMIC} uninstall ${NAME}-new
+${ATOMIC} install --name=${NAME}-new --runtime=/bin/ls --set=RECEIVER=${SECRET} --system atomic-test-system
+assert_matches /bin/ls /etc/systemd/system/${NAME}-new.service