diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-04-01 15:43:11 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-04-01 16:13:34 +0200 |
| commit | df58e083979a40df8c1a1391b82b2e4d856225dd (patch) | |
| tree | c2dbbe85008b9b1a946fea78ae0142f034a480e7 /interface-definitions | |
| parent | 9ea856640af398309b79cd9f1ebe8c4f025e2c62 (diff) | |
| download | vyos-1x-df58e083979a40df8c1a1391b82b2e4d856225dd.tar.gz vyos-1x-df58e083979a40df8c1a1391b82b2e4d856225dd.zip | |
container: T4959: add registry authentication option
Container registry CLI node changed from leafNode to tagNode with the same
defaults. In addition we can now configure an authentication option per
registry.
(cherry picked from commit fe82d86d3e87cb8d92ebc9d0652c08e3dd79a12c)
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 --> |