@@ -13,3 +13,3 @@
     execute_command_with_processes,
 )
-from borgmatic.hooks.data_source import dump
+from borgmatic.hooks.data_source import dump, utils

@@ -0,0 +10,4 @@
+def get_hostname_from_config(database):
+    if 'container' in database:
+        return get_ip_from_container(database['container'])
+    return database.get('hostname', '')

@@ -0,0 +14,4 @@
+
+
+def get_ip_from_container(container):
+    engines = (shutil.which(engine) for engine in ('docker', 'podman'))

@@ -0,0 +18,4 @@
+    engines = [engine for engine in engines if engine]
+
+    if not engines:
+        raise xxx  # TODO: What to raise here, tell the user to install docker/podman

@@ -0,0 +32,4 @@
+                )
+            )
+        except subprocess.CalledProcessError:
+            continue  # Container does not exist

@@ -0,0 +34,4 @@
+        except subprocess.CalledProcessError:
+            continue  # Container does not exist
+
+        network_data = json.loads(output.strip())

@@ -0,0 +44,4 @@
+            if ip:
+                return ip
+
+    raise xxx  # No container ip found, what to raise here

@@ -31,2 +29,2 @@
-        (hostname or 'localhost') + ('' if port is None else f':{port}'),
-        name,
+    identifier = (
+        label if label else (hostname or 'localhost') + ('' if port is None else f':{port}')

@@ -1323,6 +1323,23 @@ properties:
                         implicitly enables read_special (see above) to support
                         dump and restore streaming.
                     example: users
+                label:

@@ -63,2 +70,3 @@
 
-    if port:
+    if label is not UNSPECIFIED:
+        metadata = f'{name}@{label}'

@@ -315,3 +331,3 @@
                 port = None
 
-            dumps_from_archive.add(Dump(hook_name, data_source_name, hostname, port))
+            dumps_from_archive.add(Dump(hook_name, data_source_name, hostname, port, host_and_port))

@@ -1488,2 +1492,4 @@
         help='Path to restore SQLite database dumps to. Defaults to the "restore_path" option in borgmatic\'s configuration',
     )
+    restore_group.add_argument(
+        '--original-label',

@@ -1489,1 +1493,4 @@
     )
+    restore_group.add_argument(
+        '--original-label',
+        help='The label where to dump to restore came from, only necessary if you need to disambiguate dumps',

@@ -151,1 +149,3 @@
-        if option_type is None:
+        # The argument doesn't correspond to any option in the schema, or it is a complex argument, so ignore it.
+        # It's probably a flag that borgmatic has on the command-line but not in configuration.
+        if option_type in {'object', None}:

@@ -0,0 +10,4 @@
+logger = logging.getLogger(__name__)
+
+
+def resolve_database_option(option, data_source, connection_params=None, restore=False):

@@ -0,0 +21,4 @@
+    return data_source.get(option)
+
+
+def _get_hostname_from_config(data_source, connection_params=None, restore=False):

@@ -225,0 +224,4 @@
+    hostname = utils.resolve_database_option('hostname', database, restore=use_restore_options)
+    port = utils.resolve_database_option('port', database, restore=use_restore_options)
+    username = utils.resolve_database_option('username', database, restore=use_restore_options)
+    password = utils.resolve_database_option('password', database, restore=use_restore_options)

@@ -659,0 +669,4 @@
+    original_working_directory = os.getcwd()
+    original_path = os.environ.get('PATH', '')
+
+    os.environ['PATH'] = f'/app/tests/end-to-end/commands:{original_path}'

@@ -0,0 +13,4 @@
+def resolve_database_option(option, data_source, connection_params=None, restore=False):
+    # Special case `hostname` since it overlaps with `container`
+    if option == 'hostname':
+        return _get_hostname_from_config(data_source, connection_params, restore)

@@ -0,0 +37,4 @@
+    # ... and finally fall back to the normal options
+    if 'container' in data_source:
+        return get_ip_from_container(data_source['container'])
+    return data_source.get('hostname', '')

@@ -0,0 +71,4 @@
+        main_ip = network_data.get('IPAddress')
+        if main_ip:
+            return main_ip
+        # No main IP found, try the networks

@@ -0,0 +74,4 @@
+        # No main IP found, try the networks
+        for network in network_data.get('Networks', {}).values():
+            ip = network.get('IPAddress')
+            if ip:

@@ -122,6 +123,7 @@ def database_names_to_dump(database, config, username, password, environment, dr
     )
     extra_options, defaults_extra_filename = parse_extra_options(database.get('list_options'))
     password_transport = database.get('password_transport', 'pipe')
+    hostname = ds_config.resolve_database_option('hostname', database)

@@ -365,3 +369,3 @@
 
     return (
-        dump.make_data_source_dump_filename(make_dump_path('borgmatic'), name, hostname='*'),
+        dump.make_data_source_dump_filename(make_dump_path('borgmatic'), name, label='*'),

@@ -407,3 +407,1 @@
-            connection_params['username']
-            or data_source.get('restore_username', data_source.get('username'))
-        ),
+        ds_config.resolve_database_option('username', data_source, connection_params, restore=True),

@@ -49,2 +36,2 @@
-    except (AttributeError, KeyError):
-        pass
+    password = ds_config.resolve_database_option(
+        'password', database, restore_connection_params, restore=restore_connection_params

@@ -347,2 +338,3 @@
         data_source['name'],
-        data_source.get('hostname'),
+        hostname=data_source.get('hostname'),
+        port=data_source.get('port'),

@@ -176,0 +188,4 @@
+            data_source['name'],
+            data_source.get('hostname'),
+            data_source.get('port'),
+            data_source.get('label') or data_source.get('container') or UNSPECIFIED,

@@ -372,3 +389,3 @@
                 port = None
 
-            dumps_from_archive.add(Dump(hook_name, data_source_name, hostname, port))
+            dumps_from_archive.add(Dump(hook_name, data_source_name, hostname, port, host_and_port))

@@ -326,6 +333,8 @@ def dump_data_sources(
                     database['name'],
                     database.get('hostname', 'localhost'),

@@ -6,6 +6,7 @@ import borgmatic.borg.pattern
 import borgmatic.config.paths
 import borgmatic.hooks.credential.parse
 from borgmatic.execute import execute_command, execute_command_with_processes
+from borgmatic.hooks.data_source import config as ds_config

@@ -12,6 +12,7 @@ from borgmatic.execute import (
     execute_command_and_capture_output,
     execute_command_with_processes,
 )
+from borgmatic.hooks.data_source import config as ds_config

@@ -241,3 +228,2 @@
 
-Alter the ports in these examples to suit your particular database system.
-
+Now borgmatic will use the `docker`/`podman` CLI to figure out the container IP.

@@ -0,0 +6,4 @@
+from borgmatic.hooks.data_source import config
+
+
+def test_get_database_option():

@@ -0,0 +19,4 @@
+    assert (
+        config.resolve_database_option('option', data_source, connection_params, restore=True)
+        == 'connection_value'
+    )

@@ -0,0 +22,4 @@
+    )
+
+
+def test_get_hostname_option_via_container():