3 files changed, 35 insertions, 4 deletions
diff --git a/src/migration-scripts/container/0-to-1 b/src/migration-scripts/container/0-to-1
index 99102a5e6..6f11bdbac 100644
--- a/src/migration-scripts/container/0-to-1
+++ b/src/migration-scripts/container/0-to-1
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-# T4870: change underlaying container filesystem from vfs to overlay
+# T4870: change underlying container filesystem from vfs to overlay
 
 import os
 import shutil
@@ -35,7 +35,7 @@ def migrate(config: ConfigTree) -> None:
             image_name = config.return_value(base + [container, 'image'])
             call(f'sudo podman image save --quiet --output /root/{container}.tar --format oci-archive {image_name}')
 
-    # No need to adjust the strage driver online (this is only used for testing and
+    # No need to adjust the storage driver online (this is only used for testing and
     # debugging on a live system) - it is already overlay2 when the migration script
     # is run during system update. But the specified driver in the image is actually
     # overwritten by the still present VFS filesystem on disk. Thus podman still
diff --git a/src/migration-scripts/container/1-to-2 b/src/migration-scripts/container/1-to-2
index c12dd8ebb..8664cfac9 100644
--- a/src/migration-scripts/container/1-to-2
+++ b/src/migration-scripts/container/1-to-2
@@ -1,4 +1,4 @@
-# Copyright 2024 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/migration-scripts/container/2-to-3 b/src/migration-scripts/container/2-to-3
new file mode 100644
index 000000000..0b43ecdb2
--- /dev/null
+++ b/src/migration-scripts/container/2-to-3
@@ -0,0 +1,31 @@
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+# T7473: container: allow log-driver to be set per container
+
+from vyos.configtree import ConfigTree
+
+def migrate(config: ConfigTree) -> None:
+    log_base = ['container', 'log-driver']
+    container_base = ['container', 'name']
+
+    if not config.exists(log_base):
+        return
+    else:
+        log_driver = config.return_value(log_base)
+        for container in config.list_nodes(container_base):
+            # Set the log-driver for each container
+            config.set(container_base + [container, 'log-driver'], value=log_driver)
+        config.delete(log_base)