From 396074d23507a615a02ff602bde018fe80c2f80b Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 15 Jul 2015 14:49:39 -0700 Subject: [PATCH] Revert "Temporary bump of docker-machine" This reverts commit 23010796e64c0cfdd83b066b2be24d6aa5f1ac8d. --- Gruntfile.js | 6 ++---- package.json | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 6c6396dd..be4d8542 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,10 +6,8 @@ var electron = require('electron-prebuilt'); var WINDOWS_DOCKER_URL = 'https://get.docker.com/builds/Windows/x86_64/docker-' + packagejson['docker-version'] + '.exe'; var DARWIN_DOCKER_URL = 'https://get.docker.com/builds/Darwin/x86_64/docker-' + packagejson['docker-version']; -// var WINDOWS_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_windows-amd64.exe'; -// var DARWIN_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_darwin-amd64'; -var WINDOWS_DOCKER_MACHINE_URL = 'https://github.com/kitematic/kitematic/releases/download/v' + packagejson.version + '/docker-machine_windows-amd64.exe'; -var DARWIN_DOCKER_MACHINE_URL = 'https://github.com/kitematic/kitematic/releases/download/v' + packagejson.version + '/docker-machine_darwin-amd64'; +var WINDOWS_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_windows-amd64.exe'; +var DARWIN_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_darwin-amd64'; var DARWIN_COMPOSE_URL = 'https://github.com/docker/compose/releases/download/' + packagejson['docker-compose-version'] + '/docker-compose-Darwin-x86_64'; var BOOT2DOCKER_ISO_URL = 'https://github.com/boot2docker/boot2docker/releases/download/v' + packagejson['docker-version'] + '/boot2docker.iso'; diff --git a/package.json b/package.json index 519d5664..22f61d00 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ } ], "docker-version": "1.7.0", - "docker-machine-version": "0.4.0-dev", + "docker-machine-version": "0.3.0-rc2", "docker-compose-version": "1.3.0", "electron-version": "0.27.2", - "virtualbox-version": "v5.0.0", + "virtualbox-version": "5.0.0", "virtualbox-filename": "VirtualBox-5.0.0.pkg", "virtualbox-filename-win": "VirtualBox-5.0.0.exe", "virtualbox-checksum": "9aa3746c508643cfd70093f484ac0a64e02438d740020e294d65a7fd409bdb3d",