Merge pull request #3045 from vyos/mergify/bp/sagitta/pr-3044

container: T5909: move registry login to op-mode (backport #3044)

1 files changed, 2 insertions, 21 deletions

diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py
index 321d00abf..e967bee71 100755
--- a/src/conf_mode/container.py
+++ b/src/conf_mode/container.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021-2023 VyOS maintainers and contributors
+# Copyright (C) 2021-2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -32,7 +32,6 @@ from vyos.utils.file import write_file
 from vyos.utils.process import call
 from vyos.utils.process import cmd
 from vyos.utils.process import run
-from vyos.utils.process import rc_cmd
 from vyos.template import bracketize_ipv6
 from vyos.template import inc_ip
 from vyos.template import is_ipv4
@@ -251,7 +250,7 @@ def verify(container):
             if 'authentication' not in registry_config:
                 continue
             if not {'username', 'password'} <= set(registry_config['authentication']):
-                raise ConfigError('If registry username or or password is defined, so must be the other!')
+                raise ConfigError('Container registry requires both username and password to be set!')
 
     return None
 
@@ -401,24 +400,6 @@ def generate(container):
 
             write_file(f'/etc/containers/networks/{network}.json', json_write(tmp, indent=2))
 
-    if 'registry' in container:
-        cmd = f'podman logout --all'
-        rc, out = rc_cmd(cmd)
-        if rc != 0:
-            raise ConfigError(out)
-
-        for registry, registry_config in container['registry'].items():
-            if 'disable' in registry_config:
-                continue
-            if 'authentication' in registry_config:
-                if {'username', 'password'} <= set(registry_config['authentication']):
-                    username = registry_config['authentication']['username']
-                    password = registry_config['authentication']['password']
-                    cmd = f'podman login --username {username} --password {password} {registry}'
-                    rc, out = rc_cmd(cmd)
-                    if rc != 0:
-                        raise ConfigError(out)
-
     render(config_containers, 'container/containers.conf.j2', container)
     render(config_registry, 'container/registries.conf.j2', container)
     render(config_storage, 'container/storage.conf.j2', container)