diff options
| -rw-r--r-- | interface-definitions/container.xml.in | 21 | ||||
| -rw-r--r-- | interface-definitions/include/constraint/container-network.xml.i | 6 |
2 files changed, 22 insertions, 5 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index f0db8a6f2..7e1f4811a 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -128,7 +128,17 @@ </leafNode> <leafNode name="image"> <properties> - <help>Image name in the hub-registry</help> + <help>Container image to use</help> + <completionHelp> + <script>sudo podman image list --format "{{.Repository}}:{{.Tag}}"</script> + </completionHelp> + <valueHelp> + <format>txt</format> + <description>Image name in the hub-registry</description> + </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,255}</regex> + </constraint> </properties> </leafNode> <leafNode name="command"> @@ -165,6 +175,9 @@ <format>txt</format> <description>Set label option value</description> </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,255}</regex> + </constraint> </properties> </leafNode> </children> @@ -211,6 +224,7 @@ <completionHelp> <path>container network</path> </completionHelp> + #include <include/constraint/container-network.xml.i> </properties> <children> <leafNode name="address"> @@ -426,10 +440,7 @@ <tagNode name="network"> <properties> <help>Network name</help> - <constraint> - <regex>[-_a-zA-Z0-9]{1,11}</regex> - </constraint> - <constraintErrorMessage>Network name cannot be longer than 11 characters</constraintErrorMessage> + #include <include/constraint/container-network.xml.i> </properties> <children> #include <include/generic-description.xml.i> diff --git a/interface-definitions/include/constraint/container-network.xml.i b/interface-definitions/include/constraint/container-network.xml.i new file mode 100644 index 000000000..6f0f06d6f --- /dev/null +++ b/interface-definitions/include/constraint/container-network.xml.i @@ -0,0 +1,6 @@ +<!-- include start from constraint/container-network.xml.i --> +<constraint> + <regex>[-_a-zA-Z0-9]{1,11}</regex> +</constraint> +<constraintErrorMessage>Network name cannot be longer than 11 characters</constraintErrorMessage> +<!-- include end --> |