Merge pull request #135 from NERSC/dingp/squashing_with_top_id_fix_#134

fix #134 use the trusted top layer id from image info
NERSC · Dec 24, 2024 · 85ad161 · 85ad161
2 parents 16d5dcb + 4fdbea2
commit 85ad161
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/podman_hpc/migrate2scratch.py b/podman_hpc/migrate2scratch.py
@@ -422,11 +422,11 @@ def migrate_image(self, image):
             return False
 
         img_id = img_info["id"]
+        top_id = img_info["layer"]
         # Get the layers from the manifest
-        rld = self._get_img_layers(self.src, img_info["layer"])
+        rld = self._get_img_layers(self.src, top_id)
 
         # make sure the src squash file exist
-        top_id = rld[-1]["id"]
         logging.debug(f"Reading link: {top_id}")
 
         if self.dst.chk_image(img_id):
@@ -468,11 +468,11 @@ def remove_image(self, image):
             logging.error(f"Image {image} not found\n")
             return False
         img_id = img_info["id"]
+        top_id = img_info["layer"]
         # Get the layers from the manifest
-        rld = self._get_img_layers(self.dst, img_info["layer"])
+        rld = self._get_img_layers(self.dst, top_id)
 
         # make sure the src squash file exist
-        top_id = rld[-1]["id"]
         ln = self.dst.read_link_file(top_id)
         sqf = self.dst.get_squash_filename(ln)
         if os.path.exists(sqf):

diff --git a/podman_hpc/podman_hpc.py b/podman_hpc/podman_hpc.py
@@ -15,7 +15,7 @@
 from subprocess import Popen, PIPE
 
 
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 
 def _round_nearest(x, a):