diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-04-05 17:52:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-05 17:52:00 +0200 |
| commit | 0b0f991a86461ed725762010cf263fb2f0eaa16a (patch) | |
| tree | c2dbbe85008b9b1a946fea78ae0142f034a480e7 /interface-definitions | |
| parent | e890a70d134fc63507ec396f9b7d4290df1cc0cb (diff) | |
| parent | df58e083979a40df8c1a1391b82b2e4d856225dd (diff) | |
| download | vyos-1x-0b0f991a86461ed725762010cf263fb2f0eaa16a.tar.gz vyos-1x-0b0f991a86461ed725762010cf263fb2f0eaa16a.zip | |
Merge pull request #1928 from c-po/t4959-backport
T4959: Add container registry authentication config for containers (backport)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/container.xml.in | 11 | ||||
| -rw-r--r-- | interface-definitions/include/generic-password.xml.i | 15 | ||||
| -rw-r--r-- | interface-definitions/include/generic-username.xml.i | 15 |
3 files changed, 37 insertions, 4 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index 91fb4dba0..f092ad9bb 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -368,13 +368,16 @@ </leafNode> </children> </tagNode> - <leafNode name="registry"> + <tagNode name="registry"> <properties> - <help>Registry Name (default: docker.io, quay.io)</help> - <multi/> + <help>Registry Name</help> </properties> <defaultValue>docker.io quay.io</defaultValue> - </leafNode> + <children> + #include <include/interface/authentication.xml.i> + #include <include/generic-disable-node.xml.i> + </children> + </tagNode> </children> </node> </interfaceDefinition> diff --git a/interface-definitions/include/generic-password.xml.i b/interface-definitions/include/generic-password.xml.i new file mode 100644 index 000000000..76d5f12d8 --- /dev/null +++ b/interface-definitions/include/generic-password.xml.i @@ -0,0 +1,15 @@ +<!-- include start from generic-password.xml.i --> +<leafNode name="password"> + <properties> + <help>Password used for authentication</help> + <valueHelp> + <format>txt</format> + <description>Password</description> + </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,128}</regex> + </constraint> + <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/generic-username.xml.i b/interface-definitions/include/generic-username.xml.i new file mode 100644 index 000000000..678f30ddf --- /dev/null +++ b/interface-definitions/include/generic-username.xml.i @@ -0,0 +1,15 @@ +<!-- include start from generic-username.xml.i --> +<leafNode name="username"> + <properties> + <help>Username used for authentication</help> + <valueHelp> + <format>txt</format> + <description>Username</description> + </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,128}</regex> + </constraint> + <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> |