syscontainer: support rpm embedded in the image

If an rpm file is already present the the container image. just use it. Signed-off-by: Giuseppe Scrivano <[email protected]> Closes: #767 Approved by: rhatdan
projectatomic · Mar 22, 2017 · 640e3e7 · 640e3e7
1 parent 5f3a498
commit 640e3e7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Atomic/syscontainers.py b/Atomic/syscontainers.py
@@ -1644,6 +1644,10 @@ def generate_rpm(self, repo, auto, name, image):
             if self.display:
                 return None
 
+            included_rpm = os.path.join(rootfs, "rootfs", "exports", "container.rpm")
+            if os.path.exists(included_rpm):
+                return included_rpm
+
             installed_files = None
             with open(os.path.join(rootfs, "info"), "r") as info_file:
                 info = json.loads(info_file.read())