Merge branch 'current' into 2fa

1 files changed, 34 insertions, 15 deletions

diff --git a/src/op_mode/containers_op.py b/src/op_mode/containers_op.py
index 1e3fc3a8f..bc317029c 100755
--- a/src/op_mode/containers_op.py
+++ b/src/op_mode/containers_op.py
@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-from vyos.configquery import query_context, ConfigQueryError
-from vyos.util import cmd
 
-config, op = query_context()
+from getpass import getuser
+from vyos.configquery import ConfigTreeQuery
+from vyos.util import cmd
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--all", action="store_true", help="Show all containers")
@@ -26,34 +26,53 @@ parser.add_argument("-i", "--image", action="store_true", help="Show container i
 parser.add_argument("-n", "--networks", action="store_true", help="Show container images")
 parser.add_argument("-p", "--pull", action="store", help="Pull image for container")
 parser.add_argument("-d", "--remove", action="store", help="Delete container image")
+parser.add_argument("-u", "--update", action="store", help="Update given container image")
 
-if not config.exists(['container']):
+config = ConfigTreeQuery()
+base = ['container']
+if not config.exists(base):
     print('Containers not configured')
     exit(0)
 
+if getuser() != 'root':
+    raise OSError('This functions needs to be run as root to return correct results!')
+
 if __name__ == '__main__':
     args = parser.parse_args()
 
     if args.all:
         print(cmd('podman ps --all'))
-        exit(0)
-    if args.image:
+
+    elif args.image:
         print(cmd('podman image ls'))
-        exit(0)
-    if args.networks:
+
+    elif args.networks:
         print(cmd('podman network ls'))
-        exit(0)
-    if args.pull:
+
+    elif args.pull:
         image = args.pull
         try:
-            print(cmd(f'sudo podman image pull {image}'))
+            print(cmd(f'podman image pull {image}'))
         except:
             print(f'Can\'t find or download image "{image}"')
-        exit(0)
-    if args.remove:
+
+    elif args.remove:
         image = args.remove
         try:
-            print(cmd(f'sudo podman image rm {image}'))
+            print(cmd(f'podman image rm {image}'))
         except:
             print(f'Can\'t delete image "{image}"')
-        exit(0)
+
+    elif args.update:
+        tmp = config.get_config_dict(base + ['name', args.update],
+                                     key_mangling=('-', '_'), get_first_key=True)
+        try:
+            image = tmp['image']
+            print(cmd(f'podman image pull {image}'))
+        except:
+            print(f'Can\'t find or download image "{image}"')
+    else:
+        parser.print_help()
+        exit(1)
+
+    exit(0)