Merge "Combine tty and stdin_open"
This commit is contained in:
commit
282c4f300c
zun_ui
api
static/dashboard/container/containers
@ -49,8 +49,7 @@ def container_create(request, **kwargs):
|
|||||||
run = value
|
run = value
|
||||||
continue
|
continue
|
||||||
elif key == "interactive":
|
elif key == "interactive":
|
||||||
args["tty"] = value
|
args["interactive"] = value
|
||||||
args["stdin_open"] = value
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if key in CONTAINER_CREATE_ATTRS:
|
if key in CONTAINER_CREATE_ATTRS:
|
||||||
|
@ -137,9 +137,8 @@
|
|||||||
'status': {label: gettext('Status'), filters: ['noValue'] },
|
'status': {label: gettext('Status'), filters: ['noValue'] },
|
||||||
'status_detail': {label: gettext('Status Detail'), filters: ['noValue'] },
|
'status_detail': {label: gettext('Status Detail'), filters: ['noValue'] },
|
||||||
'status_reason': {label: gettext('Status Reason'), filters: ['noValue'] },
|
'status_reason': {label: gettext('Status Reason'), filters: ['noValue'] },
|
||||||
'stdin_open': {label: gettext('Stdin Open'), filters: ['yesno'] },
|
'interactive': {label: gettext('Interactive'), filters: ['yesno'] },
|
||||||
'task_state': {label: gettext('Task State'), filters: ['noValue'] },
|
'task_state': {label: gettext('Task State'), filters: ['noValue'] },
|
||||||
'tty': {label: gettext('TTY'), filters: ['yesno'] },
|
|
||||||
'workdir': {label: gettext('Workdir'), filters: ['noValue'] }
|
'workdir': {label: gettext('Workdir'), filters: ['noValue'] }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
"when this container was created.</p>");
|
"when this container was created.</p>");
|
||||||
if (ctrl.container.status !== "Running") {
|
if (ctrl.container.status !== "Running") {
|
||||||
console = $("<p>Container is not running.</p>");
|
console = $("<p>Container is not running.</p>");
|
||||||
} else if (ctrl.container.tty && ctrl.container.stdin_open) {
|
} else if (ctrl.container.interactive) {
|
||||||
console = $("<iframe id=\"console_embed\" src=\"" + consoleUrl +
|
console = $("<iframe id=\"console_embed\" src=\"" + consoleUrl +
|
||||||
"\" style=\"width:100%;height:100%\"></iframe>");
|
"\" style=\"width:100%;height:100%\"></iframe>");
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
resource-type-name="OS::Zun::Container"
|
resource-type-name="OS::Zun::Container"
|
||||||
cls="dl-horizontal"
|
cls="dl-horizontal"
|
||||||
item="ctrl.container"
|
item="ctrl.container"
|
||||||
property-groups="[['host', 'workdir', 'environment', 'stdin_open', 'tty',
|
property-groups="[['host', 'workdir', 'environment', 'interactive',
|
||||||
'labels','links']]">
|
'labels','links']]">
|
||||||
</hz-resource-property-list>
|
</hz-resource-property-list>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user