From 99f1519e74454c520b1d630581599825e258b49e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 15:07:04 -0700 Subject: [PATCH 01/10] Fixing outline on + button --- styles/theme.less | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/theme.less b/styles/theme.less index e5bda86122..b7b75e86a0 100644 --- a/styles/theme.less +++ b/styles/theme.less @@ -26,6 +26,7 @@ a { &:hover { text-decoration: none; } + outline: 0 !important; } input[type="text"] { From a12a90b76597c1cb64ae088a0ea0aa1e3c3ce2d1 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 15:07:30 -0700 Subject: [PATCH 02/10] Removed unncessary log statement & tabindex attribute --- src/components/ContainerHomeFolders.react.js | 1 - src/components/Containers.react.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ContainerHomeFolders.react.js b/src/components/ContainerHomeFolders.react.js index 4bd3ef8bd7..4fb6028aa2 100644 --- a/src/components/ContainerHomeFolders.react.js +++ b/src/components/ContainerHomeFolders.react.js @@ -63,7 +63,6 @@ var ContainerHomeFolder = React.createClass({ return false; } - console.log(this.props.container.Volumes); var folders = _.map(_.omit(this.props.container.Volumes, (v, k) => k.indexOf('/Users/') !== -1), (val, key) => { var firstFolder = key.split('/')[1]; return ( diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js index 20e7a8b6f2..b7ef82dcb5 100644 --- a/src/components/Containers.react.js +++ b/src/components/Containers.react.js @@ -161,7 +161,7 @@ var Containers = React.createClass({

Containers

- +
From 0ca35b5db1d614a0d0d00c98d060fdd4fc220ae5 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 15:08:43 -0700 Subject: [PATCH 03/10] If vbox net service is down then ask users in setup to restart it --- src/stores/SetupStore.js | 4 +++- src/utils/SetupUtil.js | 2 +- src/utils/VirtualBoxUtil.js | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js index ddedcb3545..588d2c07e8 100644 --- a/src/stores/SetupStore.js +++ b/src/stores/SetupStore.js @@ -49,6 +49,8 @@ var _steps = [{ } catch (err) { throw null; } + } else if (!virtualBox.active()) { + yield util.exec(setupUtil.macSudoCmd(util.escapePath('/Library/Application Support/VirtualBox/LaunchDaemons/VirtualBoxStartup.sh') + ' restart')); } }) }, { @@ -157,7 +159,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), { var vboxNeedsInstall = !virtualBox.installed(); required.download = vboxNeedsInstall && (!fs.existsSync(vboxfile) || setupUtil.checksum(vboxfile) !== virtualBox.checksum()); - required.install = vboxNeedsInstall; + required.install = vboxNeedsInstall || !virtualBox.active(); required.init = required.install || !(yield machine.exists()) || (yield machine.state()) !== 'Running' || !isoversion || util.compareVersions(isoversion, packagejson['docker-version']) < 0; var exists = yield machine.exists(); diff --git a/src/utils/SetupUtil.js b/src/utils/SetupUtil.js index a7697daec1..25925741f4 100644 --- a/src/utils/SetupUtil.js +++ b/src/utils/SetupUtil.js @@ -59,7 +59,7 @@ var SetupUtil = { } }, macSudoCmd: function (cmd) { - return `${util.escapePath(resources.macsudo())} -p "Kitematic requires administrative privileges to install." sh -c \"${cmd}\"`; + return `${util.escapePath(resources.macsudo())} -p "Kitematic requires administrative privileges to install and/or start VirtualBox." sh -c \"${cmd}\"`; }, simulateProgress(estimateSeconds, progress) { var times = _.range(0, estimateSeconds * 1000, 200); diff --git a/src/utils/VirtualBoxUtil.js b/src/utils/VirtualBoxUtil.js index 80705cbe78..b6729cef60 100644 --- a/src/utils/VirtualBoxUtil.js +++ b/src/utils/VirtualBoxUtil.js @@ -23,9 +23,12 @@ var VirtualBox = { if(util.isWindows()) { return fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe') && fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VirtualBox.exe'); } else { - return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app'); + return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VBoxManage'); } }, + active: function () { + return fs.existsSync('/dev/vboxnetctl'); + }, version: function () { return new Promise((resolve, reject) => { util.exec([this.command(), '-v']).then(stdout => { From d52a922075d5ac2a36c5eff88880ba890651bf2d Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Thu, 11 Jun 2015 15:32:06 -0700 Subject: [PATCH 04/10] Adding Kitematic screenshot Adding Kitematic screenshot --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ff1fcca754..3467aabe2e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Kitematic is a simple application for managing Docker containers on Mac OS X and Windows (coming soon). +![Kitematic Screenshot](https://cloud.githubusercontent.com/assets/3325447/8119971/ef5fd1da-104e-11e5-88f1-50aaa53a4bca.png) + ## Installing Kitematic [Download the latest version](https://kitematic.com/download) of Kitematic. From 604570d04f5b2726bdf6b6ddf259436d585c6205 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Thu, 11 Jun 2015 15:32:22 -0700 Subject: [PATCH 05/10] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 3467aabe2e..530202f6be 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Kitematic is a simple application for managing Docker containers on Mac OS X and Windows (coming soon). -![Kitematic Screenshot](https://cloud.githubusercontent.com/assets/3325447/8119971/ef5fd1da-104e-11e5-88f1-50aaa53a4bca.png) ## Installing Kitematic From f4b215c97da57a4b96050925744925fec3f23585 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Thu, 11 Jun 2015 15:33:17 -0700 Subject: [PATCH 06/10] Adding Kitematic screenshot --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 530202f6be..13cd747b60 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Kitematic is a simple application for managing Docker containers on Mac OS X and Windows (coming soon). +![Kitematic Screenshot](https://cloud.githubusercontent.com/assets/3325447/8119979/152f1010-104f-11e5-9298-cd3e92b61ec6.png) ## Installing Kitematic From af408821d78257a2548bfd7ec72b6ecbe6c0149a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 15:40:30 -0700 Subject: [PATCH 07/10] Update CONTRIBUTING.md --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fc1617a3d..953f2a7460 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,8 +17,7 @@ Before you fil an issue or a pull request, quickly read of the following tips on ### Prerequisites -Most of the time, you'll have installed Kitematic before contibuting, but for the -sake of completeness, you can also install [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/). +- [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/). ### Other Prerequisites (Mac) - The latest Xcode from the Apple App Store. From 1f53f47134081fbc26ddb612540b04ca6468039e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 15:40:37 -0700 Subject: [PATCH 08/10] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 953f2a7460..521a4850d8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ Before you fil an issue or a pull request, quickly read of the following tips on ### Prerequisites -- [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/). +- [Node.js 0.10.38](https://nodejs.org/dist/v0.10.38/) ### Other Prerequisites (Mac) - The latest Xcode from the Apple App Store. From e598bae73dc7e7669d13fb606ca234b894e3e136 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 16:46:15 -0700 Subject: [PATCH 09/10] Temporarily removing coverage until jest is fixed --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 13cd747b60..2eb39471f4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![Build Status](https://travis-ci.org/kitematic/kitematic.svg?branch=master)](https://travis-ci.org/kitematic/kitematic) -[![Coverage Status](https://coveralls.io/repos/kitematic/kitematic/badge.svg?branch=master)](https://coveralls.io/r/kitematic/kitematic?branch=master) [![bitHound Score](https://www.bithound.io/github/kitematic/kitematic/badges/score.svg)](https://www.bithound.io/github/kitematic/kitematic) From 303fe335c9f49aa4810eec08743983f9316f945f Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 11 Jun 2015 16:51:50 -0700 Subject: [PATCH 10/10] Bump to 0.6.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 447b9c1286..a2ee190495 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Kitematic", - "version": "0.6.5", + "version": "0.6.6", "author": "Kitematic", "description": "Simple Docker Container management for Mac OS X.", "homepage": "https://kitematic.com/",