From 98000359baee0cde8098b851e86f58bbe670671a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 16 Apr 2015 16:29:18 -0400 Subject: [PATCH 1/3] bumping to 0.5.14 with docker 1.6 --- gulpfile.js | 1 + package.json | 8 ++++---- src/SetupStore.js | 5 ----- util/deps | 4 +--- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2836301e15..1146a693e2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -106,6 +106,7 @@ gulp.task('dist', function () { 'mkdir -p dist/osx/<%= filename %>/Contents/Resources/app/resources', 'cp -v resources/* dist/osx/<%= filename %>/Contents/Resources/app/resources/ || :', 'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/atom.icns', + 'cp ./util/Info.plist dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleVersion <%= version %>" dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist', diff --git a/package.json b/package.json index 43c981279e..ec6a219f2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Kitematic", - "version": "0.5.13", + "version": "0.5.14", "author": "Kitematic", "description": "Simple Docker Container management for Mac OS X.", "homepage": "https://kitematic.com/", @@ -16,7 +16,7 @@ "release": "gulp release", "release:beta": "gulp release --beta", "preinstall": "./util/deps", - "postinstall": "if [ `uname` == 'Darwin' ]; then gulp download && cp util/Info.plist cache/Atom.app/Contents/Info.plist && cp util/kitematic.icns cache/Atom.app/Contents/Resources/atom.icns; fi", + "postinstall": "gulp download", "lint": "jsxhint src && jsxhint browser" }, "licenses": [ @@ -45,8 +45,8 @@ "/node_modules/bluebird" ] }, - "docker-version": "1.5.0", - "docker-machine-version": "0.1.0-kitematic-0.5.10", + "docker-version": "1.6.0", + "docker-machine-version": "0.2.0", "atom-shell-version": "0.23.0", "virtualbox-version": "4.3.26", "virtualbox-filename": "VirtualBox-4.3.26.pkg", diff --git a/src/SetupStore.js b/src/SetupStore.js index 981b007ae1..c4bab1ff0c 100644 --- a/src/SetupStore.js +++ b/src/SetupStore.js @@ -77,10 +77,6 @@ var _steps = [{ return; } - if ((yield machine.state()) === 'Saved') { - yield virtualBox.wake(machine.name()); - } - var isoversion = machine.isoversion(); var packagejson = util.packagejson(); if (!isoversion || setupUtil.compareVersions(isoversion, packagejson['docker-version']) < 0) { @@ -89,7 +85,6 @@ var _steps = [{ } if ((yield machine.state()) !== 'Running') { yield machine.start(); - yield machine.regenerateCerts(); } }) }]; diff --git a/util/deps b/util/deps index 4bd6a249bc..ecd9322500 100755 --- a/util/deps +++ b/util/deps @@ -21,9 +21,7 @@ fi if [ ! -f $DOCKER_MACHINE_CLI_FILE ]; then echo "-----> Downloading Docker Machine CLI..." rm -rf docker-machine* - # Use temporary, new version of docker-machine that has some important fixes - # curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_CLI_VERSION/docker-machine_darwin-amd64 - curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/kitematic/kitematic/releases/download/v0.5.10/docker-machine_darwin-amd64 + curl -L -o $DOCKER_MACHINE_CLI_FILE https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_CLI_VERSION/docker-machine_darwin-amd64 chmod +x $DOCKER_MACHINE_CLI_FILE fi From 3cf1a378359c5ce107a5cf42c7d4a5d7c214dd87 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 16 Apr 2015 16:47:51 -0400 Subject: [PATCH 2/3] fixing test --- src/SetupStore-test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SetupStore-test.js b/src/SetupStore-test.js index 42add6fd37..47a07968a6 100644 --- a/src/SetupStore-test.js +++ b/src/SetupStore-test.js @@ -76,19 +76,16 @@ describe('SetupStore', function () { machine.isoversion.mockReturnValue('1.0'); machine.stop.mockReturnValue(Promise.resolve()); machine.start.mockReturnValue(Promise.resolve()); - machine.regenerateCerts.mockReturnValue(Promise.resolve()); machine.upgrade.mockReturnValue(Promise.resolve()); setupUtil.compareVersions.mockReturnValue(-1); machine.create.mockClear(); machine.upgrade.mockClear(); machine.stop.mockClear(); machine.start.mockClear(); - machine.regenerateCerts.mockClear(); return setupStore.steps().init.run(() => {}).then(() => { expect(machine.create).not.toBeCalled(); expect(machine.stop).toBeCalled(); expect(machine.upgrade).toBeCalled(); - expect(machine.regenerateCerts).toBeCalled(); expect(machine.start).toBeCalled(); }); }); From 77ee7b3485cd3727ac3a540ba00438a91b567a2c Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 16 Apr 2015 17:22:43 -0400 Subject: [PATCH 3/3] removing postinstall --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ec6a219f2d..b410c402fa 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,10 @@ "bugs": "https://github.com/kitematic/kitematic/issues", "scripts": { "start": "gulp", - "test": "jest --coverage", + "test": "jest", "release": "gulp release", "release:beta": "gulp release --beta", "preinstall": "./util/deps", - "postinstall": "gulp download", "lint": "jsxhint src && jsxhint browser" }, "licenses": [