docker-squash 1.2.0__tar.gz → 1.2.1__tar.gz

{docker-squash-1.2.0/docker_squash.egg-info → docker_squash-1.2.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: docker-squash
-Version: 1.2.0
+Version: 1.2.1
 Summary: Docker layer squashing tool
 Home-page: https://github.com/goldmann/docker-squash
-Download-URL: https://github.com/goldmann/docker-squash/archive/1.2.0.tar.gz
+Download-URL: https://github.com/goldmann/docker-squash/archive/1.2.1.tar.gz
 Author: Marek Goldmann
 Author-email: marek.goldmann@gmail.com
 License: MIT

{docker-squash-1.2.0 → docker_squash-1.2.1}/docker_squash/image.py

@@ -220,9 +220,9 @@ class Image(object):
                 "Single layer marked to squash, no squashing is required"
             )
 
-        self.log.info("Attempting to squash last %s layers...", number_of_layers)
-        self.log.debug("Layers to squash: %s", self.layers_to_squash)
-        self.log.debug("Layers to move: %s", self.layers_to_move)
+        self.log.info(f"Attempting to squash last {number_of_layers} layers...")
+        self.log.debug(f"Layers to squash: {self.layers_to_squash}")
+        self.log.debug(f"Layers to move: {self.layers_to_move}")
 
         # Fetch the image and unpack it on the fly to the old image directory
         self._save_image(self.old_image_id, self.old_image_dir)

{docker-squash-1.2.0 → docker_squash-1.2.1}/docker_squash/v2_image.py

@@ -16,6 +16,9 @@ class V2Image(Image):
     def _before_squashing(self):
         super(V2Image, self)._before_squashing()
 
+        # New OCI Archive format type
+        self.oci_format = True
+
         # Read old image manifest file
         self.old_image_manifest = self._get_manifest()
         self.log.debug(
@@ -39,6 +42,9 @@ class V2Image(Image):
         if self.layer_paths_to_move:
             self.squash_id = self.layer_paths_to_move[-1]
 
+        self.log.debug(f"Layers paths to squash: {self.layer_paths_to_squash}")
+        self.log.debug(f"Layers paths to move: {self.layer_paths_to_move}")
+
     def _squash(self):
         if self.layer_paths_to_squash:
             # Prepare the directory
@@ -372,8 +378,6 @@ class V2Image(Image):
 
     def _get_manifest(self):
         if os.path.exists(os.path.join(self.old_image_dir, "index.json")):
-            # New OCI Archive format type
-            self.oci_format = True
             # Not using index.json to extract manifest details as while the config
             # sha could be extracted via some indirection i.e.
             #

docker_squash-1.2.1/docker_squash/version.py

@@ -0,0 +1 @@
+version = "1.2.1"

{docker-squash-1.2.0 → docker_squash-1.2.1/docker_squash.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: docker-squash
-Version: 1.2.0
+Version: 1.2.1
 Summary: Docker layer squashing tool
 Home-page: https://github.com/goldmann/docker-squash
-Download-URL: https://github.com/goldmann/docker-squash/archive/1.2.0.tar.gz
+Download-URL: https://github.com/goldmann/docker-squash/archive/1.2.1.tar.gz
 Author: Marek Goldmann
 Author-email: marek.goldmann@gmail.com
 License: MIT

{docker-squash-1.2.0 → docker_squash-1.2.1}/tests/test_integ_squash.py

@@ -13,6 +13,7 @@ import docker.errors
 import mock
 import pytest
 from packaging import version as packaging_version
+from parameterized import parameterized
 
 from docker_squash.errors import SquashError, SquashUnnecessaryError
 from docker_squash.lib import common
@@ -37,7 +38,7 @@ class ImageHelper(object):
 
 
 class IntegSquash(unittest.TestCase):
-    BUSYBOX_IMAGE = "busybox:1.34"
+    BUSYBOX_IMAGE = "busybox:1.36.1"
 
     log = logging.getLogger()
     handler = logging.StreamHandler()
@@ -698,7 +699,7 @@ class TestIntegSquash(IntegSquash):
         )
 
         with self.Image(dockerfile) as image:
-            with self.SquashedImage(image, 2) as squashed_image:
+            with self.SquashedImage(image, 2, numeric=True) as squashed_image:
                 self.assertEqual(len(squashed_image.layers), len(image.layers) - 1)
                 image_data_layers = [s for s in image.tarnames if "layer.tar" in s]
                 squashed_image_data_layers = [
@@ -735,7 +736,7 @@ class TestIntegSquash(IntegSquash):
         )
 
         with self.Image(dockerfile) as image:
-            with self.SquashedImage(image, 2) as squashed_image:
+            with self.SquashedImage(image, 2, numeric=True) as squashed_image:
                 self.assertEqual(len(squashed_image.layers), len(image.layers) - 1)
 
     def test_should_squash_exactly_3_layers_with_data(self):
@@ -757,9 +758,9 @@ class TestIntegSquash(IntegSquash):
         dockerfile = (
             """
         FROM %s
-        RUN touch /abc
         CMD /bin/env
         LABEL foo bar
+        RUN touch /abc
         """
             % TestIntegSquash.BUSYBOX_IMAGE
         )
@@ -796,7 +797,7 @@ class TestIntegSquash(IntegSquash):
     def test_remove_tmp_dir_after_failure(self):
         self.caplog.set_level(logging.DEBUG, logger="cekit")
         dockerfile = """
-        FROM busybox:1.24.0
+        FROM busybox:1.36.1
         LABEL foo bar
         """
 
@@ -820,7 +821,7 @@ class TestIntegSquash(IntegSquash):
 
     def test_should_not_remove_tmp_dir_after_failure_if_development_mode_is_on(self):
         dockerfile = """
-        FROM busybox:1.24.0
+        FROM busybox:1.36.1
         LABEL foo bar
         """
 
@@ -1261,7 +1262,7 @@ class NumericValues(IntegSquash):
     @classmethod
     def setUpClass(cls):
         dockerfile = """
-        FROM busybox:1.24.0
+        FROM busybox:1.36.1
         RUN touch /tmp/test1
         RUN touch /tmp/test2
         CMD /bin/env
@@ -1306,41 +1307,24 @@ class NumericValues(IntegSquash):
             with self.SquashedImage(NumericValues.image, 1, numeric=True):
                 pass
 
-    def test_should_squash_2_layers(self):
-        with self.SquashedImage(NumericValues.image, 2, numeric=True) as squashed_image:
-            i_h = NumericValues.image.history[0]
-            s_h = squashed_image.history[0]
+    @parameterized.expand([(2,), (3,), (4,)])
+    def test_should_squash_n_layers(self, number_of_layers):
+        with self.SquashedImage(
+            NumericValues.image, number_of_layers, numeric=True
+        ) as squashed_image:
+            i_h = NumericValues.image.history[number_of_layers:]
+            s_h = squashed_image.history[1:]
 
-            for key in "Comment", "Size":
-                self.assertEqual(i_h[key], s_h[key])
-            self.assertEqual(s_h["CreatedBy"], "")
             self.assertEqual(
-                len(squashed_image.layers), len(NumericValues.image.layers) - 1
+                len(squashed_image.layers),
+                len(NumericValues.image.layers) - (number_of_layers - 1),
             )
 
-    def test_should_squash_3_layers(self):
-        with self.SquashedImage(NumericValues.image, 3, numeric=True) as squashed_image:
-            i_h = NumericValues.image.history[0]
-            s_h = squashed_image.history[0]
-
-            for key in "Comment", "Size":
-                self.assertEqual(i_h[key], s_h[key])
-            self.assertEqual(s_h["CreatedBy"], "")
-            self.assertEqual(
-                len(squashed_image.layers), len(NumericValues.image.layers) - 2
-            )
-
-    def test_should_squash_4_layers(self):
-        with self.SquashedImage(NumericValues.image, 4, numeric=True) as squashed_image:
-            i_h = NumericValues.image.history[0]
-            s_h = squashed_image.history[0]
-
-            for key in "Comment", "Size":
-                self.assertEqual(i_h[key], s_h[key])
-            self.assertEqual(s_h["CreatedBy"], "")
-            self.assertEqual(
-                len(squashed_image.layers), len(NumericValues.image.layers) - 3
-            )
+            for c in range(len(i_h)):
+                for key in "CreatedBy", "Comment", "Size":
+                    self.assertEqual(s_h[c][key], i_h[c][key])
+            self.assertEqual(squashed_image.history[0]["Comment"], "")
+            self.assertEqual(squashed_image.history[0]["CreatedBy"], "")
 
 
 if __name__ == "__main__":

docker-squash-1.2.0/docker_squash/version.py

@@ -1 +0,0 @@
-version = "1.2.0"