Podman support and option to backup across all projects

README.md

@@ -133,7 +133,7 @@ Contributions are welcome regardless of experience level.
 
 ## Python environment
 
-Use [`uv`](https://docs.astral.sh/uv/) within the `src/` directory to manage your development environment.
+Use [`uv`](https://docs.astral.sh/uv/) within the the repo root directory to manage your development environment.
 
 ```bash
 git clone https://github.com/lawndoc/stack-back.git

src/entrypoint.sh

@@ -6,6 +6,13 @@ rcb dump-env > /.env
 # Write crontab
 rcb crontab > crontab
 
-# start cron in the foreground
+# Start cron in the background and capture its PID
 crontab crontab
-crond -f
+crond -f &
+CRON_PID=$!
+
+# Trap termination signals and kill the cron process
+trap 'kill $CRON_PID; exit 0' TERM INT
+
+# Wait for cron and handle signals
+wait $CRON_PID

src/restic_compose_backup/backup_runner.py

@@ -12,7 +12,7 @@ def run(
     volumes: dict = None,
     environment: dict = None,
     labels: dict = None,
-    source_container_id: str = None,
+    source_container_network: str = None,
 ):
     logger.info("Starting backup container")
     client = utils.docker_client()
@@ -21,11 +21,10 @@ def run(
         image,
         command,
         labels=labels,
-        # auto_remove=True,  # We remove the container further down
         detach=True,
         environment=environment + ["BACKUP_PROCESS_CONTAINER=true"],
         volumes=volumes,
-        network_mode=f"container:{source_container_id}",  # Reuse original container's network stack.
+        network=source_container_network,
         working_dir=os.getcwd(),
         tty=True,
     )

src/restic_compose_backup/cli.py

@@ -138,7 +138,7 @@ def status(config, containers):
     logger.info("-" * 67)
 
 
-def backup(config, containers):
+def backup(config, containers: RunningContainers):
     """Request a backup to start"""
     # Make sure we don't spawn multiple backup processes
     if containers.backup_process_running:
@@ -169,7 +169,7 @@ def backup(config, containers):
             command="rcb start-backup-process",
             volumes=volumes,
             environment=containers.this_container.environment,
-            source_container_id=containers.this_container.id,
+            source_container_network=containers.this_container.network_name,
             labels={
                 containers.backup_process_label: "True",
                 "com.docker.compose.project": containers.project_name,

src/restic_compose_backup/config.py

@@ -29,6 +29,9 @@ def __init__(self, check=True):
         self.swarm_mode = os.environ.get("SWARM_MODE") or False
         self.include_project_name = os.environ.get("INCLUDE_PROJECT_NAME") or False
         self.exclude_bind_mounts = os.environ.get("EXCLUDE_BIND_MOUNTS") or False
+        self.include_all_compose_projects = (
+            os.environ.get("INCLUDE_ALL_COMPOSE_PROJECTS") or False
+        )
         self.include_all_volumes = os.environ.get("INCLUDE_ALL_VOLUMES") or False
         if self.include_all_volumes:
             logger.warning(

src/restic_compose_backup/containers.py

@@ -1,6 +1,6 @@
-import os
 import logging
 from pathlib import Path
+import socket
 from typing import List
 
 from restic_compose_backup import enums, utils
@@ -57,9 +57,22 @@ def id(self) -> str:
         return self._data.get("Id")
 
     @property
-    def hostname(self) -> str:
-        """Hostname of the container"""
-        return self.get_config("Hostname", default=self.id[0:12])
+    def network_details(self) -> dict:
+        """dict: The network details of the container"""
+        network_settings: dict = self._data.get("NetworkSettings", {})
+        networks: dict = network_settings.get("Networks", {})
+        first_network = list(networks.values())[0]
+        return first_network
+
+    @property
+    def network_name(self) -> str:
+        """str: The name of the network the container is connected to"""
+        return self.network_details.get("NetworkID", "")
+
+    @property
+    def ip_address(self) -> str:
+        """str: IP address of the container"""
+        return self.network_details.get("IPAddress", "")
 
     @property
     def image(self) -> str:
@@ -407,13 +420,13 @@ def __init__(self):
         # Find the container we are running in.
         # If we don't have this information we cannot continue
         for container_data in all_containers:
-            if container_data.get("Id").startswith(os.environ["HOSTNAME"]):
+            if container_data.get("Id").startswith(socket.gethostname()):
                 self.this_container = Container(container_data)
 
         if not self.this_container:
             raise ValueError("Cannot find metadata for backup container")
 
-        # Gather all running containers in the current compose setup
+        # Gather relevant containers
         for container_data in all_containers:
             container = Container(container_data)
 
@@ -429,25 +442,22 @@ def __init__(self):
             if not container.is_running:
                 continue
 
+            # If not swarm mode we need to filter in compose project
+            if (
+                not config.swarm_mode
+                and not config.include_all_compose_projects
+                and container.project_name != self.this_container.project_name
+            ):
+                continue
+
             # Gather stop during backup containers
             if container.stop_during_backup:
-                if config.swarm_mode:
-                    self.stop_during_backup_containers.append(container)
-                else:
-                    if container.project_name == self.this_container.project_name:
-                        self.stop_during_backup_containers.append(container)
+                self.stop_during_backup_containers.append(container)
 
             # Detect running backup process container
             if container.is_backup_process_container:
                 self.backup_process_container = container
 
-            # --- Determine what containers should be evaluated
-
-            # If not swarm mode we need to filter in compose project
-            if not config.swarm_mode:
-                if container.project_name != self.this_container.project_name:
-                    continue
-
             # Containers started manually are not included
             if container.is_oneoff:
                 continue

src/restic_compose_backup/containers_db.py

@@ -21,7 +21,7 @@ def get_credentials(self) -> dict:
             username = self.get_config_env("MARIADB_USER")
             password = self.get_config_env("MARIADB_PASSWORD")
         return {
-            "host": self.hostname,
+            "host": self.ip_address,
             "username": username,
             "password": password,
             "port": "3306",
@@ -91,7 +91,7 @@ def get_credentials(self) -> dict:
             username = self.get_config_env("MYSQL_USER")
             password = self.get_config_env("MYSQL_PASSWORD")
         return {
-            "host": self.hostname,
+            "host": self.ip_address,
             "username": username,
             "password": password,
             "port": "3306",
@@ -155,7 +155,7 @@ class PostgresContainer(Container):
     def get_credentials(self) -> dict:
         """dict: get credentials for the service"""
         return {
-            "host": self.hostname,
+            "host": self.ip_address,
             "username": self.get_config_env("POSTGRES_USER"),
             "password": self.get_config_env("POSTGRES_PASSWORD"),
             "port": "5432",

src/restic_compose_backup/log.py

@@ -1,9 +1,7 @@
 import logging
-import os
 import sys
 
 logger = logging.getLogger("restic_compose_backup")
-HOSTNAME = os.environ["HOSTNAME"]
 
 DEFAULT_LOG_LEVEL = logging.INFO
 LOG_LEVELS = {
@@ -22,7 +20,5 @@ def setup(level: str = "warning"):
 
     ch = logging.StreamHandler(stream=sys.stdout)
     ch.setLevel(level)
-    # ch.setFormatter(logging.Formatter('%(asctime)s - {HOSTNAME} - %(name)s - %(levelname)s - %(message)s'))
-    # ch.setFormatter(logging.Formatter('%(asctime)s - {HOSTNAME} - %(levelname)s - %(message)s'))
     ch.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s: %(message)s"))
     logger.addHandler(ch)

src/tests/tests.py

@@ -1,4 +1,3 @@
-import json
 import os
 import unittest
 from unittest import mock
@@ -16,16 +15,21 @@
 class BaseTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        """Set up basic environment variables"""
-        # os.environ['RESTIC_REPOSITORY'] = "test"
-        # os.environ['RESTIC_PASSWORD'] = "password"
+        cls.backup_hash = fixtures.generate_sha256()
+
+        cls.hostname_patcher = mock.patch(
+            "socket.gethostname", return_value=cls.backup_hash[:8]
+        )
+        cls.hostname_patcher.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.hostname_patcher.stop()
 
     def createContainers(self):
-        backup_hash = fixtures.generate_sha256()
-        os.environ["HOSTNAME"] = backup_hash[:8]
         return [
             {
-                "id": backup_hash,
+                "id": self.backup_hash,
                 "service": "backup",
             }
         ]
@@ -377,10 +381,12 @@ def test_stop_container_during_backup_database(self):
 class IncludeAllVolumesTests(BaseTestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         config.config.auto_backup_all = "true"
 
     @classmethod
     def tearDownClass(cls):
+        super().tearDownClass()
         config.config = config.Config()
 
     def test_all_volumes(self):