From 165d463c690204dca3d82bef05bdc6371a5db371 Mon Sep 17 00:00:00 2001 From: TeckniX Date: Wed, 29 Apr 2015 17:26:09 -0400 Subject: [PATCH 1/4] Added support for env shell called via settings Signed-off-by: TeckniX --- src/components/ContainerDetailsSubheader.react.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js index fa5670e4f7..a62a943b6e 100644 --- a/src/components/ContainerDetailsSubheader.react.js +++ b/src/components/ContainerDetailsSubheader.react.js @@ -134,8 +134,12 @@ var ContainerDetailsSubheader = React.createClass({ metrics.track('Terminaled Into Container'); var container = this.props.container; var terminal = path.join(process.cwd(), 'resources', 'terminal'); + var shell = ContainerUtil.env(container).SHELL + if(typeof shell == "undefined") { + shell = 'sh'; + } machine.ip().then(ip => { - var cmd = [terminal, 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 'exec', '-i', '-t', container.Name, 'sh']; + var cmd = [terminal, 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 'exec', '-i', '-t', container.Name, shell]; exec(cmd, function (stderr, stdout, code) { if (code) { console.log(stderr); From 3436076052dd165ecb1f904e628ef6e1904181be Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 30 Apr 2015 13:27:55 -0400 Subject: [PATCH 2/4] Fixing live logs Signed-off-by: Jeffrey Morgan --- src/stores/ContainerStore.js | 7 ++----- src/stores/LogStore.js | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js index 9cdd9e1abf..552858aa9b 100644 --- a/src/stores/ContainerStore.js +++ b/src/stores/ContainerStore.js @@ -5,7 +5,7 @@ var assign = require('object-assign'); var docker = require('../utils/DockerUtil'); var metrics = require('../utils/MetricsUtil'); var registry = require('../utils/RegistryUtil'); -var logstore = require('../stores/LogStore'); +var logStore = require('../stores/LogStore'); var bugsnag = require('bugsnag-js'); var _placeholders = {}; @@ -118,6 +118,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { return; } self.fetchContainer(name, callback); + logStore.fetch(name); }); }, _createContainer: function (name, containerData, callback) { @@ -363,9 +364,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { if (!data.name) { data.name = data.Name; } - if (name !== data.name) { - logstore.rename(name, data.name); - } var fullData = assign(_containers[name], data); this._createContainer(name, fullData, function () { _muted[name] = false; @@ -374,7 +372,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), { }.bind(this)); }, rename: function (name, newName, callback) { - logstore.rename(name, newName); docker.client().getContainer(name).rename({name: newName}, err => { if (err && err.statusCode !== 204) { callback(err); diff --git a/src/stores/LogStore.js b/src/stores/LogStore.js index a3ba515f80..464f512c01 100644 --- a/src/stores/LogStore.js +++ b/src/stores/LogStore.js @@ -68,11 +68,15 @@ module.exports = assign(Object.create(EventEmitter.prototype), { } this.emit(this.SERVER_LOGS_EVENT); }); + logStream.on('end', () => { + this.detach(name); + }); }); }, detach: function (name) { if (_streams[name]) { _streams[name].destroy(); + delete _streams[name]; } }, logs: function (name) { From 0b2c26fb1dc917767f390560f589ccb6de24b6e6 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 30 Apr 2015 13:28:32 -0400 Subject: [PATCH 3/4] Removing unused function Signed-off-by: Jeffrey Morgan --- src/stores/LogStore.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/stores/LogStore.js b/src/stores/LogStore.js index 464f512c01..7a886ee497 100644 --- a/src/stores/LogStore.js +++ b/src/stores/LogStore.js @@ -81,10 +81,5 @@ module.exports = assign(Object.create(EventEmitter.prototype), { }, logs: function (name) { return _logs[name] || []; - }, - rename: function (name, newName) { - if (_logs[name]) { - _logs[newName] = _logs[name]; - } } }); From 542c0efe6ea335b632dfa87034aa6066ace082fc Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 30 Apr 2015 13:51:07 -0400 Subject: [PATCH 4/4] Bumping version to 0.5.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c2f735c7c..de486e50b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Kitematic", - "version": "0.5.22", + "version": "0.5.23", "author": "Kitematic", "description": "Simple Docker Container management for Mac OS X.", "homepage": "https://kitematic.com/",