mantis-cli 22.0.2__tar.gz → 22.1.0__tar.gz

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis_cli
-Version: 22.0.2
+Version: 22.1.0
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský
@@ -75,6 +75,34 @@ TODO:
 
 See [template file](https://github.com/PragmaticMates/mantis-cli/blob/master/mantis/mantis.tpl) for exact JSON structure.
 
+### Build settings
+
+With `build.tool` set to `"docker"`, mantis builds each service that declares a `build:` section
+in your compose files, reading `context`, `dockerfile`, `args`, `platform`, `cache_from` and
+`cache_to` from it. Nothing else needs configuring — the compose file stays the single source of
+truth:
+
+```yaml
+services:
+  backend:
+    image: acme/app:production
+    build:
+      context: ../../../
+      dockerfile: ./configs/docker/production/backend/Dockerfile
+      cache_from:
+        - type=registry,ref=acme/app:production
+      cache_to:
+        - type=inline
+```
+
+`cache_from` and `cache_to` become `--cache-from` / `--cache-to` on `docker build`, which is how
+you keep a layer cache across machines that share no local docker state — CI runners, for
+instance. Inline cache stores the metadata in the image being pushed and reads it back from the
+previous one, so no separate cache tag is needed; note that it records only the final image's
+layers, which is enough whenever earlier build stages copy their output forward.
+
+With `build.tool` set to `"compose"`, `docker compose build` handles all of this itself.
+
 ### Connections
 
 Mantis supports two connection modes: **multi-environment** and **single connection**.

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/README.md

@@ -53,6 +53,34 @@ TODO:
 
 See [template file](https://github.com/PragmaticMates/mantis-cli/blob/master/mantis/mantis.tpl) for exact JSON structure.
 
+### Build settings
+
+With `build.tool` set to `"docker"`, mantis builds each service that declares a `build:` section
+in your compose files, reading `context`, `dockerfile`, `args`, `platform`, `cache_from` and
+`cache_to` from it. Nothing else needs configuring — the compose file stays the single source of
+truth:
+
+```yaml
+services:
+  backend:
+    image: acme/app:production
+    build:
+      context: ../../../
+      dockerfile: ./configs/docker/production/backend/Dockerfile
+      cache_from:
+        - type=registry,ref=acme/app:production
+      cache_to:
+        - type=inline
+```
+
+`cache_from` and `cache_to` become `--cache-from` / `--cache-to` on `docker build`, which is how
+you keep a layer cache across machines that share no local docker state — CI runners, for
+instance. Inline cache stores the metadata in the image being pushed and reads it back from the
+previous one, so no separate cache tag is needed; note that it records only the final image's
+layers, which is enough whenever earlier build stages copy their output forward.
+
+With `build.tool` set to `"compose"`, `docker compose build` handles all of this itself.
+
 ### Connections
 
 Mantis supports two connection modes: **multi-environment** and **single connection**.

mantis_cli-22.1.0/mantis/__init__.py

@@ -0,0 +1 @@
+VERSION = '22.1.0'

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/mantis/managers.py

@@ -823,6 +823,7 @@ class BaseManager(AbstractManager):
             for service, info in self.services_to_build().items():
                 platform = f"--platform={info['platform']}" if info['platform'] != '' else ''
                 cache_from = ' '.join([f"--cache-from {cache}" for cache in info['cache_from']]) if info['cache_from'] != [] else ''
+                cache_to = ' '.join([f"--cache-to {cache}" for cache in info['cache_to']]) if info['cache_to'] != [] else ''
                 args = ' '.join([f"--build-arg {key}={value}" for key, value in info['args'].items()]) if info['args'] != {} else ''
                 image = info['image'] if info['image'] != '' else f"{info['project_name']}-{service}".lstrip('-')
 
@@ -831,7 +832,7 @@ class BaseManager(AbstractManager):
                 dockerfile = str(Path(context) / info['dockerfile'])
 
                 self.docker(
-                    f"build {context} {build_args} {args} {platform} {cache_from} -t {image} -f {dockerfile} {params}",
+                    f"build {context} {build_args} {args} {platform} {cache_from} {cache_to} -t {image} -f {dockerfile} {params}",
                     use_connection=False)
         else:
             CLI.error(f'Unknown build tool: {build_tool}. Available tools: {", ".join(available_tools)}')
@@ -899,6 +900,7 @@ class BaseManager(AbstractManager):
                         'dockerfile': build.get('dockerfile', 'Dockerfile'),
                         'context': build.get('context', '.'),
                         'cache_from': build.get('cache_from', []),
+                        'cache_to': build.get('cache_to', []),
                         'args': build.get('args', {}),
                         'image': service_config.get('image', ''),
                         'platform': service_config.get('platform', '')

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/mantis_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 22.0.2
+Version: 22.1.0
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský
@@ -75,6 +75,34 @@ TODO:
 
 See [template file](https://github.com/PragmaticMates/mantis-cli/blob/master/mantis/mantis.tpl) for exact JSON structure.
 
+### Build settings
+
+With `build.tool` set to `"docker"`, mantis builds each service that declares a `build:` section
+in your compose files, reading `context`, `dockerfile`, `args`, `platform`, `cache_from` and
+`cache_to` from it. Nothing else needs configuring — the compose file stays the single source of
+truth:
+
+```yaml
+services:
+  backend:
+    image: acme/app:production
+    build:
+      context: ../../../
+      dockerfile: ./configs/docker/production/backend/Dockerfile
+      cache_from:
+        - type=registry,ref=acme/app:production
+      cache_to:
+        - type=inline
+```
+
+`cache_from` and `cache_to` become `--cache-from` / `--cache-to` on `docker build`, which is how
+you keep a layer cache across machines that share no local docker state — CI runners, for
+instance. Inline cache stores the metadata in the image being pushed and reads it back from the
+previous one, so no separate cache tag is needed; note that it records only the final image's
+layers, which is enough whenever earlier build stages copy their output forward.
+
+With `build.tool` set to `"compose"`, `docker compose build` handles all of this itself.
+
 ### Connections
 
 Mantis supports two connection modes: **multi-environment** and **single connection**.

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/mantis_cli.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ mantis_cli.egg-info/entry_points.txt
 mantis_cli.egg-info/requires.txt
 mantis_cli.egg-info/top_level.txt
 tests/__init__.py
+tests/test_build_config.py
 tests/test_command_line.py
 tests/test_config.py
 tests/test_helpers.py

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/mantis_cli.egg-info/requires.txt

@@ -1,4 +1,5 @@
 cffi
+click
 cryptography
 pycryptodome
 pydantic

{mantis_cli-22.0.2 → mantis_cli-22.1.0}/setup.py

@@ -16,7 +16,9 @@ setup(
     url='https://github.com/PragmaticMates/mantis-cli',
     packages=find_packages(),
     include_package_data=True,
-    install_requires=['cffi', 'cryptography', 'pycryptodome', 'pydantic', 'PyYAML', 'rich', 'typer'],
+    # click is imported directly by command_line.py. It used to arrive transitively via typer,
+    # but typer 0.27.0 dropped that dependency, so a fresh install lost it.
+    install_requires=['cffi', 'click', 'cryptography', 'pycryptodome', 'pydantic', 'PyYAML', 'rich', 'typer'],
     entry_points={
         'console_scripts': ['mantis=mantis.command_line:run'],
     },

mantis_cli-22.1.0/tests/test_build_config.py

@@ -0,0 +1,143 @@
+"""Tests for build configuration read out of compose files."""
+import textwrap
+
+import pytest
+
+from mantis.managers import BaseManager
+
+
+def _manager_with_compose(tmp_path, compose_yaml):
+    """A manager wired to a single compose file, without running __init__."""
+    compose_file = tmp_path / "project.yml"
+    compose_file.write_text(textwrap.dedent(compose_yaml))
+
+    manager = BaseManager.__new__(BaseManager)
+    manager.compose_files = [str(compose_file)]
+    return manager
+
+
+class TestServicesToBuild:
+    """Tests for services_to_build parsing of the compose build section."""
+
+    def test_cache_from_and_cache_to_are_read(self, tmp_path):
+        """Both cache keys come through from the compose build section."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: ../..
+                  dockerfile: ./Dockerfile
+                  cache_from:
+                    - type=registry,ref=acme/app:production
+                  cache_to:
+                    - type=inline
+        """)
+
+        info = manager.services_to_build()["backend"]
+
+        assert info["cache_from"] == ["type=registry,ref=acme/app:production"]
+        assert info["cache_to"] == ["type=inline"]
+
+    def test_cache_keys_default_to_empty(self, tmp_path):
+        """A build section naming neither key yields empty lists, not None."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: .
+        """)
+
+        info = manager.services_to_build()["backend"]
+
+        assert info["cache_from"] == []
+        assert info["cache_to"] == []
+
+    def test_multiple_cache_entries(self, tmp_path):
+        """Several sources or destinations are all preserved, in order."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: .
+                  cache_from:
+                    - type=registry,ref=acme/app:buildcache
+                    - type=registry,ref=acme/app:production
+                  cache_to:
+                    - type=registry,ref=acme/app:buildcache,mode=max
+        """)
+
+        info = manager.services_to_build()["backend"]
+
+        assert info["cache_from"] == [
+            "type=registry,ref=acme/app:buildcache",
+            "type=registry,ref=acme/app:production",
+        ]
+        assert info["cache_to"] == ["type=registry,ref=acme/app:buildcache,mode=max"]
+
+    def test_services_without_build_are_skipped(self, tmp_path):
+        """Only services that declare a build section are returned."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: .
+              db:
+                image: postgres:18
+        """)
+
+        assert list(manager.services_to_build().keys()) == ["backend"]
+
+
+class TestBuildCommand:
+    """Tests that the cache flags reach the docker build command."""
+
+    @staticmethod
+    def _capture(manager):
+        """Record the commands build() would run instead of running them."""
+        commands = []
+        manager.config = {"build": {"tool": "docker", "args": {}}}
+        manager.compose_path = "."
+        manager.docker = lambda command, **kwargs: commands.append(command)
+        return commands
+
+    def test_both_cache_flags_are_emitted(self, tmp_path):
+        """cache_from and cache_to each become a flag on docker build."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: .
+                  dockerfile: ./Dockerfile
+                  cache_from:
+                    - type=registry,ref=acme/app:production
+                  cache_to:
+                    - type=inline
+        """)
+        commands = self._capture(manager)
+
+        manager.build()
+
+        assert len(commands) == 1
+        assert "--cache-from type=registry,ref=acme/app:production" in commands[0]
+        assert "--cache-to type=inline" in commands[0]
+
+    def test_absent_cache_keys_emit_no_flags(self, tmp_path):
+        """No cache config means neither flag appears at all."""
+        manager = _manager_with_compose(tmp_path, """
+            services:
+              backend:
+                image: acme/app:production
+                build:
+                  context: .
+        """)
+        commands = self._capture(manager)
+
+        manager.build()
+
+        assert "--cache-from" not in commands[0]
+        assert "--cache-to" not in commands[0]

mantis_cli-22.0.2/mantis/__init__.py

@@ -1 +0,0 @@
-VERSION = '22.0.2'