diff --git a/src/components/ContainerSettingsGeneral.react.js b/src/components/ContainerSettingsGeneral.react.js index cc05d1efcc..af6cf08285 100644 --- a/src/components/ContainerSettingsGeneral.react.js +++ b/src/components/ContainerSettingsGeneral.react.js @@ -22,7 +22,7 @@ var ContainerSettingsGeneral = React.createClass({ return [util.randomId(), e[0], e[1]]; }); - let [tty, openStdin] = ContainerUtil.mode(this.props.container) || [false, false]; + let [tty, openStdin] = ContainerUtil.mode(this.props.container) || [true, true]; return { slugName: null, @@ -232,7 +232,7 @@ var ContainerSettingsGeneral = React.createClass({
-

Foreground Options

+

Advanced Options

Attach standard streams to a tty, including stdin if it is not closed

Keep STDIN open even if not attached

diff --git a/src/utils/ContainerUtil.js b/src/utils/ContainerUtil.js index d4afb983cd..b94c1632c5 100644 --- a/src/utils/ContainerUtil.js +++ b/src/utils/ContainerUtil.js @@ -16,7 +16,7 @@ var ContainerUtil = { // Provide Foreground options mode: function (container) { if (!container || !container.Config) { - return [false, false]; + return [true, true]; } return [container.Config.Tty, container.Config.OpenStdin]; }, diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js index 46dceeb5a1..d1e38fedac 100644 --- a/src/utils/DockerUtil.js +++ b/src/utils/DockerUtil.js @@ -25,8 +25,6 @@ export default { throw new Error('Certificate directory does not exist'); } - console.log(ip); - this.host = ip; this.client = new dockerode({ protocol: 'https', @@ -103,6 +101,7 @@ export default { containerData.Env = containerData.Config.Env; } + containerData.Volumes = _.mapObject(containerData.Volumes, () => {return {};}); let existing = this.client.getContainer(name); @@ -162,6 +161,8 @@ export default { Config: { Image: imageName, }, + Tty: true, + OpenStdin: true, State: { Downloading: true } @@ -183,7 +184,7 @@ export default { delete this.placeholders[name]; localStorage.setItem('placeholders', JSON.stringify(this.placeholders)); - this.createContainer(name, {Image: imageName}); + this.createContainer(name, {Image: imageName, Tty: true, OpenStdin: true}); }, // progress is actually the progression PER LAYER (combined in columns)