Generate RPM and support arbitrary files copied to the host

Atomic/containers.py

@@ -151,7 +151,7 @@ def ps_tty(self):
         max_container_id = 12 if self.args.truncate else max([len(x.id) for x in container_objects])
         max_image_name = 20 if self.args.truncate else max([len(x.image_name) for x in container_objects])
         max_command = 20 if self.args.truncate else max([len(x.command) for x in container_objects])
-        col_out = "{0:2} {1:%s} {2:%s} {3:%s} {4:16} {5:9} {6:10} {7:10}" % (max_container_id, max_image_name, max_command)
+        col_out = "{0:2} {1:%s} {2:%s} {3:%s} {4:16} {5:10} {6:10} {7:10}" % (max_container_id, max_image_name, max_command)
         if self.args.heading:
             util.write_out(col_out.format(" ",
                                           "CONTAINER ID",
@@ -173,7 +173,7 @@ def ps_tty(self):
                                           con_obj.image_name[0:max_image_name],
                                           con_obj.command[0:max_command],
                                           con_obj.created[0:16],
-                                          con_obj.state[0:9],
+                                          con_obj.state[0:10],
                                           con_obj.backend.backend[0:10],
                                           con_obj.runtime[0:10]))
 

Atomic/install.py

@@ -62,6 +62,8 @@ def cli(subparser):
         system_xor_user.add_argument("--system", dest="system",
                                      action='store_true', default=False,
                                      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("--rootfs", dest="remote",
                               help=_("choose an existing exploded container/image to use "
                                      "its rootfs as a remote, read-only rootfs for the "

bash/atomic

@@ -718,6 +718,7 @@ _atomic_install() {
 	       --rootfs
 	       --storage
 	       --system
+	       --system-package
 	       --set
 	       --user
 	"

docs/atomic-install.1.md

@@ -12,6 +12,7 @@ atomic-install - Execute Image Install Method
 [**--rootfs**=*ROOTFS*]
 [**--set**=*NAME*=*VALUE*]
 [**--storage**]
+[**--system-package=auto|build|yes|no**]
 [**--system**]
 IMAGE [ARG...]
 
@@ -96,6 +97,18 @@ Note: If the image being pulled contains a label of `system.type=ostree`,
 atomic will automatically substitute the storage backend to be ostree. This
 can be overridden with the --storage option.
 
+**--system-package=auto|build|no|yes**
+Control how the container will be installed to the system.
+
+*auto* generates an rpm and install it to the system when the
+image defines a .spec file.  This is the default.
+
+*build* build only the software package, without installing it.
+
+*no* do not generate an rpm package to install the container.
+
+*yes* generate an rpm package and install it to the system.
+
 **--user**
 If running as non-root, specify to install the image from the current
 OSTree repository and manage it through systemd and bubblewrap.

tests/integration/test_system_containers.sh

@@ -255,7 +255,7 @@ test \! -e ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}
 test \! -e ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}.0
 test \! -e ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}.1
 
-${ATOMIC} pull --storage ostree docker:atomic-test-secret
+${ATOMIC} pull --storage ostree docker:atomic-test-secret:latest
 # Move directly the OSTree reference to a new one, so that we have different names and info doesn't error out
 mv ${ATOMIC_OSTREE_REPO}/refs/heads/ociimage/atomic-test-secret_3Alatest ${ATOMIC_OSTREE_REPO}/refs/heads/ociimage/atomic-test-secret-ostree_3Alatest
 ${ATOMIC} info atomic-test-secret-ostree > version.out
@@ -332,7 +332,7 @@ teardown
 
 # Install from a docker local docker image
 export NAME="test-docker-system-container-$$"
-${ATOMIC} install --name=${NAME} --set=RECEIVER=${SECRET} --system docker:atomic-test-system
+${ATOMIC} install --name=${NAME} --set=RECEIVER=${SECRET} --system docker:atomic-test-system:latest
 test -e /etc/tmpfiles.d/${NAME}.conf
 
 test -e ${ATOMIC_OSTREE_CHECKOUT_PATH}/${NAME}.0/${NAME}.service

tests/unit/test_pull.py

@@ -20,7 +20,7 @@
 class TestAtomicPull(unittest.TestCase):
     class Args():
         def __init__(self):
-            self.image = "docker:centos"
+            self.image = "docker:centos:latest"
             self.user = False
 
     def test_pull_as_privileged_user(self):