diff --git a/index.js b/index.js index eb71c67e0d..9838f3c374 100644 --- a/index.js +++ b/index.js @@ -3,6 +3,7 @@ var net = require('net'); var os = require('os'); var fs = require('fs'); var path = require('path'); +var exec = require('exec'); var autoUpdater = require('auto-updater'); var app = require('app'); @@ -117,50 +118,37 @@ app.on('activate-with-no-open-windows', function () { app.on('ready', function() { start(function (url, nodeChild, mongoChild) { - var cleanUpChildren = function () { - console.log('Cleaning up children.'); - mongoChild.kill(); - nodeChild.kill(); - }; - - var cleanUpChildrenAndQuit = function () { - console.log('Cleaning up children and quitting.'); - cleanUpChildren(); - app.quit(); - }; - - - if (nodeChild && mongoChild) { - process.on('exit', cleanUpChildren); - process.on('uncaughtException', function (err) { - console.log(err); - cleanUpChildrenAndQuit(); - }); - process.on('SIGINT', function () { - cleanUpChildrenAndQuit(); - process.exit(); - }); - process.on('SIGTERM', function () { - cleanUpChildrenAndQuit(); - process.exit(); - }); - } // Create the browser window. var windowOptions = { width: 800, height: 578, - frame: false, resizable: false, + frame: false, 'web-preferences': { 'web-security': false } }; mainWindow = new BrowserWindow(windowOptions); - mainWindow.focus(); + mainWindow.hide(); mainWindow.loadUrl(url); + process.on('uncaughtException', app.quit); + + app.on('will-quit', function (e) { + console.log('Cleaning up children.'); + if (nodeChild) { + nodeChild.kill(); + } + if (mongoChild) { + mongoChild.kill(); + } + exec('VBoxManage controlvm boot2docker-vm savestate', function (stderr, stdout, code) {}); + }); + mainWindow.webContents.on('did-finish-load', function() { + mainWindow.show(); + mainWindow.focus(); // Auto Updates autoUpdater.setFeedUrl('https://updates.kitematic.com/releases/latest?version=' + app.getVersion()); @@ -183,7 +171,6 @@ app.on('ready', function() { mainWindow.webContents.send('notify', 'window:update-available'); }); - ipc.on('command', function (event, arg) { console.log('Command: ' + arg); if (arg === 'application:quit-install') { diff --git a/meteor/client/lib/apputil.js b/meteor/client/lib/apputil.js index 5ae1610f14..8546070511 100644 --- a/meteor/client/lib/apputil.js +++ b/meteor/client/lib/apputil.js @@ -33,15 +33,10 @@ AppUtil.restartHelper = function (app) { if (err) { console.error(err); } Docker.getContainerData(app.docker.Id, function (err, data) { if (err) { console.error(err); } - Util.refreshDNS(app, function (err) { - if (err) { - console.error(err); - } - Apps.update(app._id, {$set: { - status: 'READY', - docker: data - }}); - }); + Apps.update(app._id, {$set: { + status: 'READY', + docker: data + }}); }); }); } @@ -57,15 +52,10 @@ AppUtil.start = function (appId) { if (err) { console.error(err); } Docker.getContainerData(app.docker.Id, function (err, data) { if (err) { console.error(err); } - Util.refreshDNS(app, function (err) { - if (err) { - console.error(err); - } - Apps.update(app._id, {$set: { - status: 'READY', - docker: data - }}); - }); + Apps.update(app._id, {$set: { + status: 'READY', + docker: data + }}); }); }); } diff --git a/meteor/client/lib/boot2docker.js b/meteor/client/lib/boot2docker.js index 19966da9b5..4b9f7cf782 100644 --- a/meteor/client/lib/boot2docker.js +++ b/meteor/client/lib/boot2docker.js @@ -1,24 +1,26 @@ var exec = require('exec'); var path = require('path'); var fs = require('fs'); +var path = require('path'); Boot2Docker = {}; Boot2Docker.REQUIRED_IP = '192.168.60.103'; +Boot2Docker.VERSION = '1.3.1'; Boot2Docker.command = function () { - return path.join(Util.getBinDir(), 'boot2docker-1.3.0') + ' --vm="kitematic-vm"'; + return path.join(Util.getBinDir(), 'boot2docker-' + Boot2Docker.VERSION); }; Boot2Docker.exec = function (command, callback) { - exec(Boot2Docker.command() + ' ' + command, function(err, stdout, stderr) { - callback(err, stdout, stderr); + exec(Boot2Docker.command() + ' ' + command, function(stderr, stdout, code) { + callback(stderr, stdout, code); }); }; Boot2Docker.exists = function (callback) { - this.exec('info', function (err) { - if (err) { + this.exec('info', function (stderr, stdout, code) { + if (stderr) { callback(null, false); } else { callback(null, true); @@ -27,32 +29,40 @@ Boot2Docker.exists = function (callback) { }; Boot2Docker.stop = function (callback) { - this.exec('stop', function (err, stdout) { - // Sometimes stop returns an error even though it worked - callback(null); + this.exec('stop', function (stderr, stdout, code) { + if (code) { + callback(stderr); + } else { + callback(); + } }); }; Boot2Docker.erase = function (callback) { - var VMFileLocation = path.join(Util.getHomePath(), 'VirtualBox\\ VMs/kitematic-vm'); - exec('rm -rf ' + VMFileLocation, function (err) { - callback(err); + var VMFileLocation = path.join(Util.getHomePath(), 'VirtualBox\\ VMs/boot2docker-vm'); + exec('rm -rf ' + VMFileLocation, function (stderr) { + callback(stderr); }); }; Boot2Docker.upgrade = function (callback) { var self = this; - self.stop(function (err) { - self.exec('upgrade', function (err, stdout) { - callback(err); + self.stop(function (stderr, stdout, code) { + if (code) {callback(stderr); return;} + self.exec('upgrade', function (stderr, stdout, code) { + if (code) { + callback(stderr); + } else { + callback(); + } }); }); }; Boot2Docker.ip = function (callback) { - this.exec('ip', function (err, stdout) { - if (err) { - callback(err, null); + this.exec('ip', function (stderr, stdout, code) { + if (code) { + callback(stderr, null); } else { callback(null, stdout); } @@ -60,16 +70,20 @@ Boot2Docker.ip = function (callback) { }; Boot2Docker.setIp = function (ifname, ip, callback) { - Boot2Docker.exec('ssh "sudo ifconfig ' + ifname + ' ' + ip + ' netmask 255.255.255.0"', function (err, stdout) { - Boot2Docker.exec('ssh "sudo rm -rf /var/lib/boot2docker/tls/* && sudo /etc/init.d/docker restart"', function (err, stdout) { - callback(err); + Boot2Docker.exec('ssh "sudo ifconfig ' + ifname + ' ' + ip + ' netmask 255.255.255.0"', function (stderr, stdout) { + Boot2Docker.exec('ssh "sudo rm -rf /var/lib/boot2docker/tls/* && sudo /etc/init.d/docker restart"', function (stderr, stdout) { + callback(stderr); }); }); }; Boot2Docker.init = function (callback) { - this.exec('init', function (err) { - callback(err); + this.exec('init', function (stderr, stdout, code) { + if (code) { + callback(stderr); + } else { + callback(); + } }); }; @@ -80,33 +94,19 @@ Boot2Docker.start = function (callback) { callback('Cannot start if the boot2docker VM doesn\'t exist'); return; } - self.exec('start', function (err, stdout) { - // Sometimes boot2docker returns an error code even though it's working / waiting, so treat that as success as well - if (!err || (err.indexOf('Waiting') !== -1 || err.indexOf('Writing') !== -1 || err.indexOf('Generating a server cert') !== -1)) { - self.correct(function (err) { - self.injectUtilities(function (err) { - callback(err); - }); - }); + self.exec('start', function (stderr, stdout, code) { + if (code) { + callback(stderr); } else { - callback(err); + callback(); } }); }); }; -Boot2Docker.correct = function (callback) { - Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) { - if (err) { callback(err); return; } - VirtualBox.removeDHCP(function (err) { - callback(); - }); - }); -}; - Boot2Docker.state = function (callback) { - this.exec('info', function (err, stdout, stderr) { - if (err) { callback(err, null); return; } + this.exec('info', function (stderr, stdout, code) { + if (code) { callback(stderr, null); return; } try { var info = JSON.parse(stdout); callback(null, info.State); @@ -117,9 +117,9 @@ Boot2Docker.state = function (callback) { }; Boot2Docker.diskUsage = function (callback) { - this.exec('ssh "df"', function (err, stdout) { - if (err) { - callback(err, null); + this.exec('ssh "df"', function (stderr, stdout, code) { + if (code) { + callback(stderr, null); return; } try { @@ -140,15 +140,15 @@ Boot2Docker.diskUsage = function (callback) { percent: percent }); } catch (error) { - callback(err, null); + callback(error, null); } }); }; Boot2Docker.memoryUsage = function (callback) { - this.exec('ssh "free -m"', function (err, stdout) { - if (err) { - callback(err, null); + this.exec('ssh "free -m"', function (stderr, stdout, code) { + if (code) { + callback(stderr, null); return; } try { @@ -208,25 +208,10 @@ Boot2Docker.sshKeyExists = function () { return fs.existsSync(path.join(Util.getHomePath(), '.ssh', 'id_boot2docker')); }; -/** - * Get the VM's version. - * Node that this only works if the VM is up and running. - */ -Boot2Docker.vmVersion = function (callback) { - this.exec('ssh "cat /etc/version', function (err, stdout, stderr) { - if (err) { - callback(err); - return; - } else { - callback(null, stdout); - } - }); -}; - Boot2Docker.version = function (callback) { - this.exec('version', function (err, stdout, stderr) { - if (err) { - callback(err); + this.exec('version', function (stderr, stdout, code) { + if (code) { + callback(stderr); return; } var match = stdout.match(/Client version: v(\d\.\d\.\d)/); @@ -238,12 +223,6 @@ Boot2Docker.version = function (callback) { }); }; -Boot2Docker.injectUtilities = function (callback) { - exec('/bin/cat ' + path.join(Util.getBinDir(), 'kite-binaries.tar.gz') + ' | ' + Boot2Docker.command() + ' ssh "sudo tar zx -C /usr/local/bin && sudo chown -R root.root /usr/local/bin"', function (err, stdout) { - callback(err); - }); -}; - Boot2Docker.check = function (callback) { var self = this; self.exists(function (err, exists) { @@ -254,33 +233,6 @@ Boot2Docker.check = function (callback) { self.state(function (err, state) { if (state !== 'running') { callback('boot2docker not running'); - } else { - self.correct(function (err) { - callback(err); - }); - } - }); - } - }); -}; - -Boot2Docker.resolve = function (callback) { - var self = this; - self.exists(function (err, exists) { - // If somehow the boot2docker VM doesn't exist anymor then re-create it. - if (!exists) { - self.init(function () { - self.start(function (err) { - callback(err); - }); - }); - } else { - // If it exists but it's not running.. restart it. - self.state(function (err, state) { - if (state !== 'running') { - self.start(function (err) { - callback(err); - }); } else { callback(); } @@ -288,3 +240,13 @@ Boot2Docker.resolve = function (callback) { } }); }; + +Boot2Docker.vmUpToDate = function (callback) { + fs.readFile(path.join(Util.getHomePath(), '.boot2docker', 'boot2docker.iso'), 'utf8', function (err, data) { + if (err) { + callback(err); return; + } + var index = data.indexOf('Boot2Docker-v' + Boot2Docker.VERSION); + callback(null, index !== -1); + }); +} \ No newline at end of file diff --git a/meteor/client/lib/docker.js b/meteor/client/lib/docker.js index 8d8333a3c2..30f9285640 100644 --- a/meteor/client/lib/docker.js +++ b/meteor/client/lib/docker.js @@ -6,20 +6,22 @@ var fs = require('fs'); Docker = {}; -Docker.DEFAULT_IMAGES_FILENAME = 'base-images-0.0.2.tar.gz'; -Docker.DEFAULT_IMAGES_CHECKSUM = 'a3517ac21034a1969d9ff15e3c41b1e2f1aa83c67b16a8bd0bc378ffefaf573b'; // Sha256 Checksum -Docker.HOST_IP = '192.168.60.103'; -Docker.HOST_PORT = '2376'; +Docker.hostIp = null; +Docker.hostPort = '2376'; + +Docker.setHost = function (host) { + Docker.hostIp = host; +}; Docker.client = function () { - var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm'); + var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/boot2docker-vm'); if (!fs.existsSync(certDir)) { return null; } return new Dockerode({ protocol: 'https', - host: Docker.HOST_IP, - port: Docker.HOST_PORT, + host: Docker.hostIp, + port: Docker.hostPort, ca: fs.readFileSync(path.join(certDir, 'ca.pem')), cert: fs.readFileSync(path.join(certDir, 'cert.pem')), key: fs.readFileSync(path.join(certDir, 'key.pem')) @@ -117,12 +119,7 @@ Docker.runContainer = function (app, image, callback) { }, function (err) { if (err) { callback(err, null); return; } console.log('Started container: ' + container.id); - Util.refreshDNS(app, function (err) { - if (err) { - console.error(err); - } - callback(null, container); - }); + callback(null, container); }); }); }; @@ -250,232 +247,3 @@ Docker.removeBindFolder = function (name, callback) { callback(err, stdout); }); }; - -Docker.defaultContainerOptions = function () { - return [ - { - Image: 'kite-dns', - name: 'kite-dns', - PortBindings: {'53/udp': [{ 'HostPort': '53', 'HostIp': '172.17.42.1' }]}, - Binds: ['/var/run/docker.sock:/tmp/docker.sock'] - } - ]; -}; - -Docker.defaultContainerNames = Docker.defaultContainerOptions().map(function (container) { - return container.name; -}); - -Docker.checkDefaultImages = function (callback) { - var defaultNames = Docker.defaultContainerNames; - async.each(defaultNames, function (name, innerCallback) { - var image = Docker.client().getImage(name); - image.inspect(function (err) { - if (err) { - if (err.reason === 'no such image') { - innerCallback('no such image'); - } else { - innerCallback(err); - } - } else { - innerCallback(); - } - }); - }, function (err) { - if (err) { - callback(err); - } else { - callback(); - } - }); -}; - -Docker.resolveDefaultImages = function () { - async.each(Docker.defaultContainerNames, function (name, innerCallback) { - var image = Docker.client().getImage(name); - image.inspect(function (err) { - if (err) { - if (err.reason === 'no such image') { - Docker.client().loadImage(path.join(Util.getBinDir(), Docker.DEFAULT_IMAGES_FILENAME), {}, function (err) { - if (err) { - innerCallback(err); - return; - } else { - innerCallback(); - } - }); - } else { - innerCallback(err); - } - } else { - innerCallback(); - } - }); - }); -}; - -Docker.checkDefaultContainers = function(callback) { - async.each(Docker.defaultContainerNames, function (name, innerCallback) { - var container = Docker.client().getContainer(name); - container.inspect(function (err, data) { - if (err) { - innerCallback(err); - } else { - if (data && data.State && data.State.Running) { - innerCallback(null); - } else { - innerCallback('Not running'); - } - } - }); - }, function (err) { - if (err) { - callback(err); - } else { - callback(); - } - }); -}; - -Docker.resolveDefaultContainers = function (callback) { - Docker.killAndRemoveContainers(Docker.defaultContainerNames, function (err) { - if (err) { - callback(err); - return; - } - Docker.upContainers(Docker.defaultContainerOptions(), function (err) { - callback(err); - }); - }); -}; - -Docker.reloadDefaultContainers = function (callback) { - console.log('Reloading default containers.'); - var ready = false; - async.until(function () { - return ready; - }, function (callback) { - Docker.client().listContainers(function (err) { - if (!err) { - ready = true; - } - callback(); - }); - }, function () { - console.log('Removing old Kitematic default containers.'); - Docker.killAndRemoveContainers(Docker.defaultContainerNames, function (err) { - console.log('Removed old Kitematic default containers.'); - if (err) { - console.log('Removing old Kitematic default containers ERROR.'); - callback(err); - return; - } - console.log('Loading new Kitematic default images.'); - Docker.client().loadImage(path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), {}, function (err) { - if (err) { - callback(err); - return; - } - console.log('Starting new Kitematic default containers.'); - Docker.upContainers(Docker.defaultContainerOptions(), function (err) { - callback(err); - }); - }); - }); - }); -}; - -Docker.upContainers = function (optionsList, callback) { - var createDefaultContainer = function (options, innerCallback) { - Docker.client().createContainer(options, function (err, container) { - if (err) { - innerCallback(err); - return; - } - container.start({ - PublishAllPorts: true, - PortBindings: options.PortBindings, - Binds: options.Binds - }, function (err) { - innerCallback(err); - }); - }); - }; - - async.each(optionsList, function (options, innerCallback) { - var container = Docker.client().getContainer(options.name); - container.inspect(function (err, data) { - if (err) { - if (err.reason.indexOf('no such container') !== -1) { - createDefaultContainer(options, function (err) { - innerCallback(err); - }); - } else { - innerCallback(err); - } - } else { - if (data && !data.State.Running) { - container.start(function (err) { - innerCallback(err); - }); - } else { - innerCallback(); - } - } - }); - }, function (err) { - callback(err); - }); -}; - -Docker.removeImages = function (names, callback) { - async.each(names, function (name, innerCallback) { - var image = Docker.client().getImage(name); - image.remove(function (err) { - if (err) { - console.log('remove image error'); - console.log(err); - if (err.reason === 'no such image') { - innerCallback(); - } else { - innerCallback(err); - } - } else { - innerCallback(); - } - }); - }, function (err) { - callback(err); - }); -}; - -Docker.killAndRemoveContainers = function (names, callback) { - async.each(names, function (name, innerCallback) { - var container = Docker.client().getContainer(name); - container.inspect(function (err, data) { - if (err) { - innerCallback(); - return; - } - if (data.State.Running) { - // Kill it - container.kill(function (err) { - if (err) { - innerCallback(err); - } else { - // Remove it - container.remove(function (err) { - innerCallback(err); - }); - } - }); - } else { - container.remove(function (err) { - innerCallback(err); - }); - } - }); - }, function (err) { - callback(err); - }); -}; diff --git a/meteor/client/lib/imageutil.js b/meteor/client/lib/imageutil.js index bc6f331d18..705710e409 100644 --- a/meteor/client/lib/imageutil.js +++ b/meteor/client/lib/imageutil.js @@ -270,7 +270,6 @@ ImageUtil.remove = function (imageId) { } catch (e) { console.error(e); } - Sync.removeAppWatcher(imageId); }; ImageUtil.sync = function () { diff --git a/meteor/client/lib/installer.js b/meteor/client/lib/installer.js deleted file mode 100644 index 3bff06d94a..0000000000 --- a/meteor/client/lib/installer.js +++ /dev/null @@ -1,206 +0,0 @@ -var async = require('async'); -var fs = require('fs'); -var path = require('path'); -var remote = require('remote'); -var app = remote.require('app'); - -Installer = {}; - -Installer.CURRENT_VERSION = app.getVersion(); -Installer.BASE_URL = 'https://s3.amazonaws.com/kite-installer/'; - -Installer.isUpToDate = function () { - return !!Installs.findOne({version: Installer.CURRENT_VERSION}); -}; - -/** - * Install steps. A step is a function that accepts a function (err) callback and returns once that step is complete.keys: - * - run: Function that runs the installation step and calls the callback with an error if failed. - * - pastMessage: Message to show after step completion - * - message: Message to show while step is running - * - imperativeMessage: Message to show before running - */ -Installer.steps = [ - { - run: function (callback, progressCallback) { - var installed = VirtualBox.installed(); - if (!installed) { - Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { - if (err) {callback(err); return;} - VirtualBox.install(function (err) { - if (!VirtualBox.installed()) { - callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.'); - } else { - callback(err); - } - }); - }, function (progress) { - progressCallback(progress); - }); - } else { - VirtualBox.version(function (err, installedVersion) { - if (err) {callback(err); return;} - if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) { - // Download a newer version of Virtualbox - Util.downloadFile(Installer.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { - if (err) {callback(err); return;} - VirtualBox.install(function (err) { - if (err) {callback(err); return;} - VirtualBox.version(function (err, installedVersion) { - if (err) {callback(err); return;} - if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) { - callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.'); - } else { - callback(err); - } - }); - }); - }, function (progress) { - progressCallback(progress); - }); - } else { - callback(); - } - }); - } - }, - pastMessage: 'VirtualBox Installed', - message: 'Downloading & Installing VirtualBox', - futureMessage: 'Download & Install VirtualBox if necessary' - }, - - // Initialize Boot2Docker if necessary. - { - run: function (callback) { - Boot2Docker.exists(function (err, exists) { - if (err) { callback(err); return; } - if (!exists) { - var vmFilesPath = path.join(Util.getHomePath(), 'VirtualBox\ VMs', 'kitematic-vm'); - if (fs.existsSync(vmFilesPath)) { - Util.deleteFolder(vmFilesPath); - } - Boot2Docker.init(function (err) { - callback(err); - }); - } else { - if (!Boot2Docker.sshKeyExists()) { - callback('Boot2Docker SSH key doesn\'t exist. Fix by deleting the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.'); - } else { - Boot2Docker.stop(function(err) { - Boot2Docker.upgrade(function (err) { - callback(err); - }); - }); - } - } - }); - }, - pastMessage: 'Setup the Kitematic VM (if required)', - message: 'Setting up the Kitematic VM', - futureMessage: 'Set up the Kitematic VM (if required)' - }, - - { - run: function (callback) { - VirtualBox.addCustomHostAdapter('kitematic-vm', function (err, ifname) { - callback(err); - }); - }, - pastMessage: 'Added custom host adapter to the Kitematic VM', - message: 'Adding custom host adapter to the Kitematic VM', - futureMessage: 'Add custom host adapter to the Kitematic VM' - }, - - // Start the Kitematic VM - { - run: function (callback) { - Boot2Docker.state(function (err, state) { - if (err) { callback(err); return; } - if (state !== 'running') { - console.log('starting'); - Boot2Docker.start(function (err) { - if (err) { - callback(err); - return; - } - Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) { - callback(err); - }); - }); - } else { - Boot2Docker.setIp('eth1', Boot2Docker.REQUIRED_IP, function(err) { - callback(err); - }); - } - }); - }, - pastMessage: 'Started the Kitematic VM', - message: 'Starting the Kitematic VM', - subMessage: '(This may take a few minutes)', - futureMessage: 'Start the Kitematic VM' - }, - - { - run: function (callback) { - VirtualBox.setupRouting('kitematic-vm', function (err, ifname) { - callback(err); - }); - }, - pastMessage: 'Container routing set up', - message: 'Setting up container routing (root required)', - futureMessage: 'Set up container routing to VM (root required)' - }, - - // Set up the default Kitematic images - { - run: function (callback, progressCallback) { - Util.downloadFile(Installer.BASE_URL + Docker.DEFAULT_IMAGES_FILENAME, path.join(Util.getResourceDir(), Docker.DEFAULT_IMAGES_FILENAME), Docker.DEFAULT_IMAGES_CHECKSUM, function (err) { - Docker.reloadDefaultContainers(function (err) { - callback(err); - }); - }, function (progress) { - progressCallback(progress); - }); - }, - pastMessage: 'Set up the default Kitematic images.', - message: 'Setting up the default Kitematic images...', - subMessage: '(This may take a few minutes)', - futureMessage: 'Set up the default Kitematic images' - } -]; - -Installer.run = function (callback) { - Session.set('installing', true); - var currentStep = 0; - Session.set('currentInstallStep', currentStep); - Session.set('numberOfInstallSteps', this.steps.length); - async.eachSeries(this.steps, function (step, callback) { - console.log('Performing step ' + currentStep); - Session.set('currentInstallStepProgress', 0); - step.run(function (err) { - if (err) { - callback(err); - } else { - currentStep += 1; - Session.set('currentInstallStep', currentStep); - callback(); - } - }, function (progress) { - Session.set('currentInstallStepProgress', progress); - }); - }, function (err) { - if (err) { - // if any of the steps fail - console.log('Kitematic setup failed at step ' + currentStep); - console.log(err); - Session.set('failedStep', currentStep); - Session.set('failedError', err); - callback(err); - } else { - // Setup Finished - Session.set('installing', false); - console.log('Setup finished.'); - callback(); - } - }); -}; diff --git a/meteor/client/lib/ipc.js b/meteor/client/lib/ipc.js index 37f9d94154..fb655ad56f 100644 --- a/meteor/client/lib/ipc.js +++ b/meteor/client/lib/ipc.js @@ -5,4 +5,11 @@ ipc.on('notify', function (message) { if (message === 'window:update-available') { Session.set('updateAvailable', true); } + if (message === 'application:quit') { + VirtualBox.saveVMState('boot2docker-vm', function (err) { + if (err) { + console.log(err); + } + }); + } }); \ No newline at end of file diff --git a/meteor/client/lib/router.js b/meteor/client/lib/router.js index c3bbef1d6b..4279a7756a 100755 --- a/meteor/client/lib/router.js +++ b/meteor/client/lib/router.js @@ -4,23 +4,15 @@ Router.configure({ var setting = Settings.findOne({}); if (setting && setting.tracking) { var currentPath = Router.current().path; - console.log(currentPath); ga('send', 'pageview', currentPath); } } }); -SetupController = RouteController.extend({ - layoutTemplate: 'setup_layout', - waitOn: function () { - return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('installs'), Meteor.subscribe('settings')]; - } -}); - DashboardController = RouteController.extend({ layoutTemplate: 'dashboard_layout', waitOn: function () { - return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('installs'), Meteor.subscribe('settings')]; + return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('settings')]; } }); @@ -39,41 +31,28 @@ ImageController = DashboardController.extend({ }); Router.map(function () { - - this.route('setup_intro', { - path: '/setup/intro', - controller: 'SetupController', - onBeforeAction: function () { - Session.set('installing', true); - } - }); - - this.route('setup_install', { - path: '/setup/install', - controller: 'SetupController' - }); - - this.route('setup_finish', { - path: '/setup/finish', - controller: 'SetupController' - }); - - this.route('setup', { + this.route('intro', { path: '/', - controller: 'SetupController', + waitOn: function () { + return [Meteor.subscribe('apps'), Meteor.subscribe('images'), Meteor.subscribe('settings')]; + }, action: function () { + Session.set('onIntro', true); if (this.ready()) { - if (!Installer.isUpToDate()) { - if (!Installs.findOne()) { - console.log('No installs detected, running installer again.'); + this.render(); + Setup.run(function (err) { + if (err) { + console.log('Setup failed.'); + console.log(err); } else { - // There's an install but it's lower than the current version, re-run as an 'update'. - Session.set('isUpdating', true); + var settings = Settings.findOne(); + if (!settings) { + Settings.insert({tracking: true}); + } + Session.set('onIntro', false); + Router.go('dashboard_apps'); } - this.redirect('/setup/intro'); - } else { - this.redirect('/apps'); - } + }); } } }); diff --git a/meteor/client/lib/setup.js b/meteor/client/lib/setup.js new file mode 100644 index 0000000000..fec4e28276 --- /dev/null +++ b/meteor/client/lib/setup.js @@ -0,0 +1,167 @@ +var async = require('async'); +var fs = require('fs'); +var path = require('path'); +var remote = require('remote'); +var app = remote.require('app'); + +Setup = {}; + +Setup.CURRENT_VERSION = app.getVersion(); +Setup.BASE_URL = 'https://s3.amazonaws.com/kite-installer/'; + +Setup.isUpToDate = function () { + return !!Installs.findOne({version: Setup.CURRENT_VERSION}); +}; + +/** + * Install steps. A step is a function that accepts a function (err) callback and returns once that step is complete.keys: + * - run: Function that runs the installation step and calls the callback with an error if failed. + * - message: Message to show while step is running + */ +Setup.steps = [ + { + run: function (callback, progressCallback) { + var installed = VirtualBox.installed(); + if (!installed) { + Util.downloadFile(Setup.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { + if (err) {callback(err); return;} + VirtualBox.install(function (err) { + if (!VirtualBox.installed()) { + callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.'); + } else { + callback(err); + } + }); + }, function (progress) { + progressCallback(progress); + }); + } else { + VirtualBox.version(function (err, installedVersion) { + if (err) {callback(err); return;} + if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) { + // Download a newer version of Virtualbox + Util.downloadFile(Setup.BASE_URL + VirtualBox.INSTALLER_FILENAME, path.join(Util.getResourceDir(), VirtualBox.INSTALLER_FILENAME), VirtualBox.INSTALLER_CHECKSUM, function (err) { + if (err) {callback(err); return;} + VirtualBox.killAllProcesses(function (err) { + if (err) {callback(err); return;} + VirtualBox.install(function (err) { + if (err) {callback(err); return;} + VirtualBox.version(function (err, installedVersion) { + if (err) {callback(err); return;} + if (Util.compareVersions(installedVersion, VirtualBox.REQUIRED_VERSION) < 0) { + callback('VirtualBox could not be installed. The installation either failed or was cancelled. Please try closing all VirtualBox instances and try again.'); + } else { + callback(err); + } + }); + }); + }); + }, function (progress) { + progressCallback(progress); + }); + } else { + callback(); + } + }); + } + }, + message: 'Downloading VirtualBox...' + }, + + // Initialize Boot2Docker if necessary. + { + run: function (callback) { + Boot2Docker.exists(function (err, exists) { + if (err) { callback(err); return; } + if (!exists) { + var vmFilesPath = path.join(Util.getHomePath(), 'VirtualBox\ VMs', 'boot2docker-vm'); + if (fs.existsSync(vmFilesPath)) { + Util.deleteFolder(vmFilesPath); + } + Boot2Docker.init(function (err) { + callback(err); + }); + } else { + if (!Boot2Docker.sshKeyExists()) { + callback('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.'); + } else { + Boot2Docker.vmUpToDate(function (err, upToDate) { + if (err) {callback(err); return;} + if (!upToDate) { + Boot2Docker.stop(function(err) { + Boot2Docker.upgrade(function (err) { + callback(err); + }); + }); + } else { + callback(); + } + }); + } + } + }); + }, + message: 'Setting up the Docker VM...', + }, + + // Start the Docker VM + { + run: function (callback) { + Boot2Docker.state(function (err, state) { + if (err) {callback(err); return;} + if (state !== 'running') { + Boot2Docker.start(function (err) { + callback(err); + }); + } else { + callback(); + } + }); + }, + message: 'Starting the Docker VM...', + }, + + { + run: function (callback) { + Boot2Docker.ip(function (err, ip) { + if (err) {callback(err); return;} + console.log('Setting host IP to: ' + ip); + Docker.setHost(ip); + callback(err); + }); + }, + message: 'Detecting Docker VM...' + } +]; + +Setup.run = function (callback) { + var currentStep = 0; + Session.set('currentSetupStepMessage', currentStep); + async.eachSeries(this.steps, function (step, callback) { + console.log('Performing step ' + currentStep); + Session.set('currentSetupStepProgress', 0); + Session.set('currentSetupStepMessage', step.message); + step.run(function (err) { + if (err) { + callback(err); + } else { + currentStep += 1; + callback(); + } + }, function (progress) { + Session.set('currentSetupStepProgress', progress); + }); + }, function (err) { + if (err) { + // if any of the steps fail + console.log('Kitematic setup failed at step ' + currentStep); + console.log(err); + Session.set('currentSetupFailedError', err); + callback(err); + } else { + // Setup Finished + console.log('Setup finished.'); + callback(); + } + }); +}; diff --git a/meteor/client/lib/sync.js b/meteor/client/lib/sync.js deleted file mode 100644 index 44e053f8d8..0000000000 --- a/meteor/client/lib/sync.js +++ /dev/null @@ -1,124 +0,0 @@ -var chokidar = require('chokidar'); -var path = require('path'); -var fs = require('fs'); -var child_process = require('child_process'); -var exec = require('exec'); - -Sync = {}; -Sync.watchers = {}; - -Sync.removeAppWatcher = function (id) { - if (Sync.watchers[id]) { - Sync.watchers[id].watcher.close(); - delete Sync.watchers[id]; - } -}; - -Sync.addAppWatcher = function (app) { - Sync.removeAppWatcher(app._id); - var appPath = path.join(Util.getHomePath(), 'Kitematic', app.name); - var vmDir = path.join('/var/lib/docker/binds', app.name); - var vmPath = 'ssh://docker@localhost:2022/' + vmDir; - var watcher = chokidar.watch(appPath, {ignored: /.*\.DS_Store/}); - var syncing = false; - var willSyncAgain = false; - - var syncFunc = function (event, changedPath) { - if (syncing) { - willSyncAgain = true; - return; - } - syncing = true; - var errorPattern = /The\sfile\s(.*)\son\shost/g; - var archiveErrorPattern = /Archive\s(.*)\son\shost\s.*\sshould\sbe\sDELETED/g; - var cmd = path.join(Util.getBinDir(), 'unison'); - var args = [ - cmd, - vmPath, - appPath, - '-prefer', - vmPath, - '-servercmd', - 'sudo\ unison', - '-batch', - '-log=false', - '-confirmbigdel=false', - '-ignore', - 'Name\ {*.tmp,*.unison,*.swp,*.pyc,.DS_Store}', - '-auto', - '-sshargs', - '-o\ UserKnownHostsFile=/dev/null\ -o\ StrictHostKeyChecking=no\ -o PreferredAuthentications=publickey\ -i\ ' + path.join(Util.getHomePath(), '.ssh/id_boot2docker') - ]; - - if (!fs.existsSync(appPath)) { - args.push('-ignorearchives'); - console.log('Created Kite ' + app.name + ' directory.'); - fs.mkdirSync(appPath, function (err) { - if (err) { throw err; } - }); - } - - exec(args, function (err, out, code) { - var results = null; - var location = null; - try { - if (err.indexOf('the archives are locked.') !== -1) { - results = errorPattern.exec(err); - location = results[1].replace(' ', '\\ '); - exec('/bin/rm -rf ' + location, function () { - console.log('Removed unison file.'); - console.log(location); - }); - } - if (err.indexOf('The archive file is missing on some hosts') !== -1) { - results = archiveErrorPattern.exec(err); - location = results[1].replace(' ', '\\ '); - var fullLocation = path.join(Util.getHomePath(), 'Library/Application Support/Unison', location); - var cmd = '/bin/rm -rf ' + fullLocation; - exec(cmd, function () {}); - } - } catch (e) { - //console.error(e); - } - syncing = false; - if (willSyncAgain) { - syncFunc(); - willSyncAgain = false; - } - }); - }; - - Sync.watchers[app._id] = { - watcher: watcher, - sync: syncFunc - }; - - // do a sync - syncFunc(); - watcher.on('all', syncFunc); -}; - -Sync.resolveWatchers = function (callback) { - var apps = Apps.find({}).fetch(); - var ids = _.map(apps, function(app) { - return app._id; - }); - var watcherKeys = _.keys(Sync.watchers); - var toAdd = _.difference(ids, watcherKeys); - var toRemove = _.difference(watcherKeys, ids); - - _.each(toAdd, function (id) { - Sync.addAppWatcher(Apps.findOne(id), function () {}); - }); - - _.each(toRemove, function (id) { - Sync.removeAppWatcher(id); - }); - - // Run a sync for 'pulling' changes in the volumes. - _.each(Sync.watchers, function (watcher) { - watcher.sync(); - }); - - callback(); -}; diff --git a/meteor/client/lib/util.js b/meteor/client/lib/util.js index 0f1da75816..074a266937 100755 --- a/meteor/client/lib/util.js +++ b/meteor/client/lib/util.js @@ -9,20 +9,6 @@ ncp.limit = 16; Util = {}; -Util.refreshDNS = function (app, callback) { - // Use dig to refresh the DNS - exec('/usr/bin/dig ' + app.name + '.kite @172.17.42.1', function (err, stdout, stderr) { - console.log(err); - console.log(stdout); - console.log(stderr); - if (err) { - callback(err); - } else { - callback(null); - } - }); -}; - Util.getHomePath = function () { return process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME']; }; @@ -142,25 +128,6 @@ Util.downloadFile = function (url, filename, checksum, callback, progressCallbac * @param {string} v1 The first version to be compared. * @param {string} v2 The second version to be compared. * @param {object} [options] Optional flags that affect comparison behavior: - * - * @returns {number|NaN} - * - * */ Util.compareVersions = function (v1, v2, options) { var lexicographical = options && options.lexicographical, @@ -217,7 +184,6 @@ trackLink = function (trackLabel) { var setting = Settings.findOne({}); if (setting && setting.tracking) { if (trackLabel) { - console.log(trackLabel); ga('send', 'event', 'link', 'click', trackLabel); } } diff --git a/meteor/client/lib/virtualbox.js b/meteor/client/lib/virtualbox.js index 6c0b6a1c30..6f0e537dd8 100644 --- a/meteor/client/lib/virtualbox.js +++ b/meteor/client/lib/virtualbox.js @@ -9,28 +9,22 @@ VirtualBox.INCLUDED_VERSION = '4.3.18'; VirtualBox.INSTALLER_FILENAME = 'virtualbox-4.3.18.pkg'; VirtualBox.INSTALLER_CHECKSUM = '5836c94481c460c648b9216386591a2915293ac86b9bb6c57746637796af6af2'; // Sha256 Checksum -// Info for the hostonly interface we add to the VM. -VirtualBox.HOSTONLY_HOSTIP = '192.168.60.3'; -VirtualBox.HOSTONLY_NETWORKMASK = '255.255.255.0'; - VirtualBox.installed = function () { return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VirtualBox'); }; VirtualBox.exec = function (command, callback) { - exec('/usr/bin/VBoxManage ' + command, function (error, stdout, stderr) { - callback(error, stdout, stderr); + exec('/usr/bin/VBoxManage ' + command, function (stderr, stdout, code) { + callback(stderr, stdout, code); }); }; VirtualBox.install = function (callback) { // -W waits for the process to close before finishing. - exec('open -W ' + path.join(Util.getResourceDir(), this.INSTALLER_FILENAME).replace(' ', '\\ '), function (error, stdout, stderr) { - console.log(stdout); - console.log(stderr); - if (error) { - callback(error); + exec('open -W ' + path.join(Util.getResourceDir(), this.INSTALLER_FILENAME).replace(' ', '\\ '), function (stderr, stdout, code) { + if (code) { + callback(stderr); return; } callback(null); @@ -42,9 +36,9 @@ VirtualBox.version = function (callback) { callback('VirtualBox not installed.'); return; } - this.exec('-v', function (err, stdout, stderr) { - if (err) { - callback(err); + this.exec('-v', function (stderr, stdout, code) { + if (code) { + callback(stderr); return; } // Output is x.x.xryyyyyy @@ -57,106 +51,29 @@ VirtualBox.version = function (callback) { }); }; -VirtualBox.hostOnlyIfs = function (callback) { - this.exec('list hostonlyifs', function (err, stdout, stderr) { - if (err) { - callback(err); - return; - } - var lines = stdout.split('\n'); - var hostOnlyIfs = {}; - var currentIf = null; - _.each(lines, function (line) { - if (!line.length) { - return; - } - var pieces = line.split(':'); - var key = pieces[0].trim(); - var value = pieces[1] ? pieces[1].trim() : null; - if (key === 'Name') { - currentIf = value; - hostOnlyIfs[value] = {}; - } - hostOnlyIfs[currentIf][key] = value; - }); - callback(null, hostOnlyIfs); - }); -}; - -VirtualBox.hostOnlyAdapters = function (vm, callback) { - this.exec('showvminfo ' + vm + ' --machinereadable', function (err, stdout, stderr) { - if (err) { - callback(err); - return; - } - var matches = stdout.match(/(hostonlyadapter\d+)="(vboxnet\d+)"/g); - if (!matches.length) { - callback(null, {}); +VirtualBox.shutDownRunningVMs = function (callback) { + if (!this.installed()) { + callback('VirtualBox not installed.'); + return; + } + this.exec('list runningvms | sed -E \'s/.*\\{(.*)\\}/\\1/\' | xargs -L1 -I {} VBoxManage controlvm {} savestate', function (stderr, stdout, code) { + if (code) { + callback(stderr); } else { - var objs = {}; - _.each(matches, function (match) { - var pieces = match.split('='); - objs[pieces[0]] = pieces[1].replace(/"/g, ''); - }); - callback(null, objs); - } - }); -}; - -VirtualBox.hostOnlyAdapter = function (callback) { - var self = this; - self.hostOnlyIfs(function (err, ifs) { - var iface = _.findWhere(_.toArray(ifs), {IPAddress: VirtualBox.HOSTONLY_HOSTIP}); - if (!iface) { - self.exec('hostonlyif create', function (err, stdout, stderr) { - var match = stdout.match(/Interface '(vboxnet\d+)' was successfully created/); - if (!match) { - callback('Could not parse output of hostonlyif create'); - return; - } - self.exec('hostonlyif ipconfig ' + match[1] + ' --ip ' + VirtualBox.HOSTONLY_HOSTIP + ' --netmask ' + VirtualBox.HOSTONLY_NETWORKMASK, function(err, stdout, stderr) { - if (err) { callback(err); return; } - callback(null, match[1]); - }); - }); - } else { - callback(null, iface.Name); - } - }); -}; - -VirtualBox.addCustomHostAdapter = function (vm, callback) { - var self = this; - self.hostOnlyAdapter(function (err, ifname) { - if (err) { callback(err); return; } - self.exec('modifyvm ' + vm + ' --nic2 hostonly --nictype2 virtio --cableconnected2 on --hostonlyadapter2 ' + ifname, function (err, stdout, stderr) { - callback(err, ifname); - }); - }); -}; - -VirtualBox.setupRouting = function (vm, callback) { - // Get the host only adapter or create it if it doesn't exist - this.addCustomHostAdapter(vm, function (err, ifname) { - var installFile = path.join(Util.getBinDir(), 'install'); - var cocoaSudo = path.join(Util.getBinDir(), 'cocoasudo'); - var execCommand = cocoaSudo + ' --prompt="Kitematic needs your password to allow routing *.kite requests to containers." ' + installFile; - exec(execCommand, {env: {IFNAME: ifname, GATEWAY: Boot2Docker.REQUIRED_IP}}, function (error, stdout, stderr) { - if (error) { - callback(error); - return; - } callback(); - }); + } }); }; -VirtualBox.removeDHCP = function (callback) { - var self = this; - self.hostOnlyAdapter(function (err, ifname) { - if (err) { callback(err); return; } - self.exec('dhcpserver remove --ifname ' + ifname, function (err, stdout, stderr) { - callback(err); +VirtualBox.killAllProcesses = function (callback) { + this.shutDownRunningVMs(function (err) { + if (err) {callback(err); return;} + exec('pkill VirtualBox', function (stderr, stdout, code) { + if (code) {callback(stderr); return;} + exec('pkill VBox', function (stderr, stdout, code) { + if (code) {callback(stderr); return;} + callback(); + }); }); }); }; diff --git a/meteor/client/main.js b/meteor/client/main.js index 0ce0d01840..9a8f4ec0e8 100755 --- a/meteor/client/main.js +++ b/meteor/client/main.js @@ -87,46 +87,8 @@ var fixBoot2DockerVM = function (callback) { }); }; -var fixDefaultImages = function (callback) { - Docker.checkDefaultImages(function (err) { - if (err) { - Session.set('available', false); - Docker.resolveDefaultImages(function (err) { - if (err) { - callback(); - } else { - Session.set('available', true); - callback(); - } - }); - } else { - Session.set('available', true); - callback(); - } - }); -}; - -var fixDefaultContainers = function (callback) { - Docker.checkDefaultContainers(function (err) { - if (err) { - Session.set('available', false); - Docker.resolveDefaultContainers(function (err) { - if (err) { - callback(err); - } else { - Session.set('available', true); - callback(); - } - }); - } else { - Session.set('available', true); - callback(); - } - }); -}; - Meteor.setInterval(function () { - if (!Session.get('installing')) { + if (!Session.get('onIntro')) { Boot2Docker.exists(function (err, exists) { if (err) { console.log(err); return; } if (exists) { @@ -149,10 +111,8 @@ Meteor.setInterval(function () { }, 5000); Meteor.setInterval(function () { - if (!Session.get('installing')) { - Sync.resolveWatchers(function () {}); + if (!Session.get('onIntro')) { ImageUtil.sync(); AppUtil.sync(); - AppUtil.recover(); } }, 5000); diff --git a/meteor/client/main.less b/meteor/client/main.less index 3558ad128d..68d5a05c6d 100755 --- a/meteor/client/main.less +++ b/meteor/client/main.less @@ -7,6 +7,6 @@ @import "stylesheets/widgets.import.less"; @import "stylesheets/mac.import.less"; @import "stylesheets/dashboard.import.less"; -@import "stylesheets/setup.import.less"; +@import "stylesheets/intro.import.less"; @import "stylesheets/spinner.import.less"; -@import "stylesheets/radial-progress.import.less"; +@import "stylesheets/radial.import.less"; diff --git a/meteor/client/stylesheets/intro.import.less b/meteor/client/stylesheets/intro.import.less new file mode 100644 index 0000000000..78fa0e6bb6 --- /dev/null +++ b/meteor/client/stylesheets/intro.import.less @@ -0,0 +1,15 @@ +.intro { + -webkit-app-region: drag; + height: 100%; + background: white; + + .content { + -webkit-app-region: no-drag; + margin-top: 220px; + text-align: center; + p { + .text-select(); + margin-top: 40px; + } + } +} diff --git a/meteor/client/stylesheets/radial-progress.import.less b/meteor/client/stylesheets/radial.import.less similarity index 58% rename from meteor/client/stylesheets/radial-progress.import.less rename to meteor/client/stylesheets/radial.import.less index f522a827d0..bb1b06c598 100644 --- a/meteor/client/stylesheets/radial-progress.import.less +++ b/meteor/client/stylesheets/radial.import.less @@ -1,42 +1,52 @@ +@-webkit-keyframes rotating { + from{ + -webkit-transform: rotate(0deg); + } + to{ + -webkit-transform: rotate(360deg); + } +} + .radial-progress { - @circle-size: 34px; - @circle-background: #d6dadc; - @circle-color: #3FD899; - @inset-size: 28px; - @inset-color: #fbfbfb; + + &.radial-spinner { + -webkit-animation: rotating 1.2s linear infinite; + } + + @circle-size: 96px; + @circle-background: transparent; + @inset-size: 92px; + @inset-color: white; @transition-length: 1s; - @shadow: 0px 1px 3px rgba(0,0,0,0.2); - @percentage-color: #3FD899; - @percentage-font-size: 11px; + // @percentage-color: #3FD899; + @percentage-font-size: 14px; @percentage-text-width: 57px; + margin: 0 auto; width: @circle-size; height: @circle-size; background-color: @circle-background; - border-radius: 50%; + border-radius: 100%; .circle { .mask, .fill, .shadow { width: @circle-size; height: @circle-size; position: absolute; - border-radius: 50%; - } - .shadow { - box-shadow: @shadow inset; + border-radius: 100%; } .mask, .fill { -webkit-backface-visibility: hidden; transition: -webkit-transform @transition-length; transition: -ms-transform @transition-length; transition: transform @transition-length; - border-radius: 50%; + border-radius: 100%; } - .mask { - clip: rect(0px, @circle-size, @circle-size, @circle-size/2); + .mask { + clip: rect(0px, @circle-size, @circle-size, @circle-size/2.0); .fill { - clip: rect(0px, @circle-size/2, @circle-size, 0px); - background-color: @circle-color; + clip: rect(0px, @circle-size/2.0, @circle-size, 0px); + background-color: @brand-action; } } } @@ -44,27 +54,35 @@ width: @inset-size; height: @inset-size; position: absolute; - margin-left: (@circle-size - @inset-size)/2; - margin-top: (@circle-size - @inset-size)/2; + margin-left: (@circle-size - @inset-size) / 2.0; + margin-top: (@circle-size - @inset-size) / 2.0; background-color: @inset-color; - border-radius: 50%; - box-shadow: @shadow; + border-radius: 100%; .percentage { width: @percentage-text-width; position: absolute; - top: (@inset-size - @percentage-font-size) / 2; - left: (@inset-size - @percentage-text-width) / 2; + top: (@inset-size - @percentage-font-size) / 2.0; + left: (@inset-size - @percentage-text-width) / 2.0; line-height: 1; text-align: center; - color: @percentage-color; - font-weight: 800; + // color: @percentage-color; + font-weight: 500; font-size: @percentage-font-size; } } + + &.radial-negative .circle .mask .fill { + background-color: @brand-negative; + } + + &.radial-positive .circle .mask .fill { + background-color: @brand-positive; + } + @i: 0; @increment: 180deg / 100; .loop (@i) when (@i <= 100) { diff --git a/meteor/client/stylesheets/setup.import.less b/meteor/client/stylesheets/setup.import.less deleted file mode 100644 index a520c3a160..0000000000 --- a/meteor/client/stylesheets/setup.import.less +++ /dev/null @@ -1,71 +0,0 @@ -.setup { - - -webkit-app-region: drag; - height: 100%; - background: #F8F8F8; - - .content { - margin-top: 30px; - } - - .steps { - margin-left: 180px; - margin-top: 60px; - .media-body { - margin-top: 5px; - font-size: 18px; - padding-left: 14px; - } - } - - h2 { - padding-top: 30px; - font-weight: 500; - font-size: 36px; - color: #3E3E3E; - } - - p { - margin-top: 20px; - font-size: 14px; - color: #232323; - font-weight: 500; - } - - .install_logo { - margin-top: 60px; - } - - .install-finish { - margin-top: 60px; - } - - .install-finish { - -webkit-app-region: no-drag; - margin-top: 80px; - p { - margin-top: 0; - font-size: 13px; - } - } - - .install-diagonistics { - -webkit-app-region: no-drag; - label { - text-align: left; - } - margin: 0 auto; - max-width: 300px; - margin-top: 50px; - } - - .install-continue { - -webkit-app-region: no-drag; - margin-top: 140px; - p { - margin-top: 0; - font-size: 13px; - } - } - -} diff --git a/meteor/client/views/application/layout.html b/meteor/client/views/application/layout.html index 1ceeafbe14..2bc12665fc 100755 --- a/meteor/client/views/application/layout.html +++ b/meteor/client/views/application/layout.html @@ -1,5 +1,3 @@ diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html index 6fc778b03c..71d5b17aec 100755 --- a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html +++ b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html @@ -10,7 +10,7 @@
- {{hostUrl}} + {{url}}
{{#if ports}} diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.js b/meteor/client/views/dashboard/apps/dashboard-single-app.js index 1f2a17d02b..ff98180ce1 100755 --- a/meteor/client/views/dashboard/apps/dashboard-single-app.js +++ b/meteor/client/views/dashboard/apps/dashboard-single-app.js @@ -19,7 +19,7 @@ Template.dashboard_single_app.events({ }, 'click .btn-terminal': function () { var app = this; - var cmd = Boot2Docker.command() + ' ssh -t "sudo docker-enter ' + app.docker.Id + '"'; + var cmd = Boot2Docker.command() + ' ssh -t "sudo docker exec -i -t ' + app.docker.Id + ' bash"'; Util.openTerminal(cmd); }, 'click .btn-start': function () { diff --git a/meteor/client/views/dashboard/intro/intro.html b/meteor/client/views/dashboard/intro/intro.html new file mode 100644 index 0000000000..4e9ffa61ee --- /dev/null +++ b/meteor/client/views/dashboard/intro/intro.html @@ -0,0 +1,20 @@ + diff --git a/meteor/client/views/dashboard/intro/intro.js b/meteor/client/views/dashboard/intro/intro.js new file mode 100644 index 0000000000..6996415ef4 --- /dev/null +++ b/meteor/client/views/dashboard/intro/intro.js @@ -0,0 +1,23 @@ +Template.intro.helpers({ + steps: function () { + return Setup.steps.map(function (step, index) { + step.index = index; + return step; + }); + } +}); + +Template.intro.helpers({ + currentSetupStepProgress: function () { + return Session.get('currentSetupStepProgress'); + }, + currentSetupStepMessage: function () { + return Session.get('currentSetupStepMessage') + }, + currentSetupFailedError: function () { + return Session.get('currentSetupFailedError') + }, + failedError: function () { + return Session.get('failedError'); + } +}); \ No newline at end of file diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.html b/meteor/client/views/dashboard/settings/dashboard-settings.html index 1f43408eac..9f0de72555 100644 --- a/meteor/client/views/dashboard/settings/dashboard-settings.html +++ b/meteor/client/views/dashboard/settings/dashboard-settings.html @@ -53,14 +53,5 @@ {{/if}} -
-
-

Repair Kitematic

-

You can repair Kitematic installation if the container stops working properly.

-
-
- Repair Kitematic -
-
diff --git a/meteor/client/views/dashboard/setup/setup-finish.html b/meteor/client/views/dashboard/setup/setup-finish.html deleted file mode 100644 index de5f103ff0..0000000000 --- a/meteor/client/views/dashboard/setup/setup-finish.html +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/meteor/client/views/dashboard/setup/setup-finish.js b/meteor/client/views/dashboard/setup/setup-finish.js deleted file mode 100644 index ee0b1c0d41..0000000000 --- a/meteor/client/views/dashboard/setup/setup-finish.js +++ /dev/null @@ -1,22 +0,0 @@ -Template.setup_finish.events({ - 'click .finish-button': function (e) { - var enableDiagnostics = $('.install-diagonistics input').prop('checked'); - var status = enableDiagnostics ? 'on' : 'off'; - ga('send', 'event', 'link', 'click', 'turn ' + status + ' usage analytics'); - Installs.insert({version: Installer.CURRENT_VERSION}); - var settings = Settings.findOne(); - if (!settings) { - Settings.insert({tracking: enableDiagnostics}); - } else { - Settings.update(settings._id, { - $set: { - tracking: enableDiagnostics - } - }); - } - Router.go('dashboard_apps'); - e.preventDefault(); - e.stopPropagation(); - return false; - } -}); diff --git a/meteor/client/views/dashboard/setup/setup-install.html b/meteor/client/views/dashboard/setup/setup-install.html deleted file mode 100644 index 6f837f7c42..0000000000 --- a/meteor/client/views/dashboard/setup/setup-install.html +++ /dev/null @@ -1,56 +0,0 @@ - diff --git a/meteor/client/views/dashboard/setup/setup-install.js b/meteor/client/views/dashboard/setup/setup-install.js deleted file mode 100644 index 3919a89425..0000000000 --- a/meteor/client/views/dashboard/setup/setup-install.js +++ /dev/null @@ -1,23 +0,0 @@ -Template.setup_install.helpers({ - steps: function () { - return Installer.steps.map(function (step, index) { - step.index = index; - return step; - }); - } -}); - -Template.setup_install.helpers({ - currentInstallStep: function () { - return Session.get('currentInstallStep'); - }, - currentInstallStepProgress: function () { - return Session.get('currentInstallStepProgress'); - }, - failedStep: function () { - return Session.get('failedStep'); - }, - failedError: function () { - return Session.get('failedError'); - } -}); diff --git a/meteor/client/views/dashboard/setup/setup-intro.html b/meteor/client/views/dashboard/setup/setup-intro.html deleted file mode 100644 index 2df945a90b..0000000000 --- a/meteor/client/views/dashboard/setup/setup-intro.html +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/meteor/client/views/dashboard/setup/setup-intro.js b/meteor/client/views/dashboard/setup/setup-intro.js deleted file mode 100644 index 3b5963be1e..0000000000 --- a/meteor/client/views/dashboard/setup/setup-intro.js +++ /dev/null @@ -1,16 +0,0 @@ -Template.setup_intro.events({ - 'click .continue-button': function (e) { - Router.go('setup_install'); - Installer.run(function (err) { - if (err) { - console.log('Setup failed.'); - console.log(err); - } else { - Router.go('setup_finish'); - } - }); - e.preventDefault(); - e.stopPropagation(); - return false; - } -}); diff --git a/meteor/client/views/dashboard/setup/setup-layout.html b/meteor/client/views/dashboard/setup/setup-layout.html deleted file mode 100644 index de1596d8c9..0000000000 --- a/meteor/client/views/dashboard/setup/setup-layout.html +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/meteor/client/views/dashboard/setup/setup-layout.js b/meteor/client/views/dashboard/setup/setup-layout.js deleted file mode 100644 index ac1dd47d2d..0000000000 --- a/meteor/client/views/dashboard/setup/setup-layout.js +++ /dev/null @@ -1,5 +0,0 @@ -Template.setup_layout.rendered = function () { - Meteor.setInterval(function () { - $('.header .icons a').tooltip(); - }, 1000); -}; diff --git a/meteor/client/views/includes/radial-progress.html b/meteor/client/views/includes/radial-progress.html index 56295c71b0..5542fad748 100644 --- a/meteor/client/views/includes/radial-progress.html +++ b/meteor/client/views/includes/radial-progress.html @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/meteor/client/views/includes/radial-spinner.html b/meteor/client/views/includes/radial-spinner.html new file mode 100644 index 0000000000..7073797c5b --- /dev/null +++ b/meteor/client/views/includes/radial-spinner.html @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/meteor/collections/apps.js b/meteor/collections/apps.js index 00cd62c731..a14193ca71 100755 --- a/meteor/collections/apps.js +++ b/meteor/collections/apps.js @@ -7,7 +7,6 @@ Apps.COMMON_WEB_PORTS = [ 3000, 5000, 2368, - 1337 ]; Apps.allow({ @@ -30,9 +29,6 @@ Apps.helpers({ return Images.findOne(this.imageId); } }, - hostUrl: function () { - return this.name + '.kite'; - }, ports: function () { var app = this; if (app.docker && app.docker.NetworkSettings.Ports) { @@ -46,42 +42,6 @@ Apps.helpers({ } }, url: function () { - var app = this; - var image = Images.findOne(app.imageId); - if (image && image.meta.app && image.meta.app.webPort) { - return 'http://' + app.name + '.kite:' + image.meta.app.webPort; - } else if (image && image.meta.app && image.meta.app.webPort === false) { - return null; - } else { - // Picks the best port - if (app.docker && app.docker.NetworkSettings.Ports) { - var keys = _.keys(app.docker.NetworkSettings.Ports); - var pickedPort = null; - _.each(keys, function (key) { - var port = parseInt(key.split('/')[0], 10); - if (_.contains(Apps.COMMON_WEB_PORTS, port) && port !== 22) { - pickedPort = port; - } - }); - if (pickedPort) { - return 'http://' + app.name + '.kite:' + pickedPort; - } else { - if (keys.length > 0) { - // Picks the first port that's not SSH - for (var i = 0; i < keys.length; i++) { - var port = parseInt(keys[i].split('/')[0], 10); - if (port !== 22) { - return 'http://' + app.name + '.kite:' + port; - } - } - return null; - } else { - return null; - } - } - } else { - return null; - } - } + return 'http://localhost:80'; // CHANGE ME } }); diff --git a/meteor/collections/installs.js b/meteor/collections/installs.js deleted file mode 100644 index 7b1311731e..0000000000 --- a/meteor/collections/installs.js +++ /dev/null @@ -1,13 +0,0 @@ -Installs = new Meteor.Collection('installs'); - -Installs.allow({ - 'update': function () { - return true; - }, - 'insert': function () { - return true; - }, - 'remove': function () { - return true; - } -}); diff --git a/meteor/public/install_logo.png b/meteor/public/install_logo.png deleted file mode 100644 index d457917193..0000000000 Binary files a/meteor/public/install_logo.png and /dev/null differ diff --git a/meteor/public/install_logo@2x.png b/meteor/public/install_logo@2x.png deleted file mode 100644 index fe5daf0184..0000000000 Binary files a/meteor/public/install_logo@2x.png and /dev/null differ diff --git a/resources/UNISON_LICENSE.txt b/resources/UNISON_LICENSE.txt deleted file mode 100644 index 356d8987c9..0000000000 --- a/resources/UNISON_LICENSE.txt +++ /dev/null @@ -1,682 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - - -ADDITIONAL TERMS APPLICABLE TO THE Doom 3 BFG Edition GPL Source Code. - - The following additional terms ("Additional Terms") supplement and modify - the GNU General Public License, Version 3 ("GPL") applicable to the Doom 3 - BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). In addition - to the terms and conditions of the GPL, the Doom 3 BFG Edition Source Code is - subject to the further restrictions below. - -1. Replacement of Section 15. Section 15 of the GPL shall be deleted in its -entirety and replaced with the following: - -"15. Disclaimer of Warranty. - -THE PROGRAM IS PROVIDED WITHOUT ANY WARRANTIES, WHETHER EXPRESSED OR IMPLIED, -INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR -PURPOSE, NON-INFRINGEMENT, TITLE AND MERCHANTABILITY. THE PROGRAM IS BEING -DELIVERED OR MADE AVAILABLE "AS IS", "WITH ALL FAULTS" AND WITHOUT WARRANTY OR -REPRESENTATION. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST -OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION." - -2. Replacement of Section 16. Section 16 of the GPL shall be deleted in its -entirety and replaced with the following: - -"16. LIMITATION OF LIABILITY. - -UNDER NO CIRCUMSTANCES SHALL ANY COPYRIGHT HOLDER OR ITS AFFILIATES, OR ANY -OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE -LIABLE TO YOU, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, FOR ANY -DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, DIRECT, INDIRECT, SPECIAL, -INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES ARISING FROM, OUT OF OR IN -CONNECTION WITH THE USE OR INABILITY TO USE THE PROGRAM OR OTHER DEALINGS WITH -THE PROGRAM(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED -INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE -PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), WHETHER OR NOT ANY COPYRIGHT -HOLDER OR SUCH OTHER PARTY RECEIVES NOTICE OF ANY SUCH DAMAGES AND WHETHER -OR NOT SUCH DAMAGES COULD HAVE BEEN FORESEEN." - -3. LEGAL NOTICES; NO TRADEMARK LICENSE; ORIGIN. You must reproduce faithfully -all trademark, copyright and other proprietary and legal notices on any copies -of the Program or any other required author attributions. This license does -not grant you rights to use any copyright holder or any other party’s name, -logo, or trademarks. Neither the name of the copyright holder or its -affiliates, or any other party who modifies and/or conveys the Program may be -used to endorse or promote products derived from this software without -specific prior written permission. The origin of the Program must not be -misrepresented; you must not claim that you wrote the original Program. - -Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original Program. - -4. INDEMNIFICATION. IF YOU CONVEY A COVERED WORK AND AGREE WITH ANY RECIPIENT -OF THAT COVERED WORK THAT YOU WILL ASSUME ANY LIABILITY FOR THAT COVERED WORK, -YOU HEREBY AGREE TO INDEMNIFY, DEFEND AND HOLD HARMLESS THE OTHER LICENSORS -AND AUTHORS OF THAT COVERED WORK FOR ANY DAMAEGS, DEMANDS, CLAIMS, LOSSES, -CAUSES OF ACTION, LAWSUITS, JUDGMENTS EXPENSES (INCLUDING WITHOUT LIMITATION -REASONABLE ATTORNEYS' FEES AND EXPENSES) OR ANY OTHER LIABLITY ARISING FROM, -RELATED TO OR IN CONNECTION WITH YOUR ASSUMPTIONS OF LIABILITY. \ No newline at end of file diff --git a/resources/cocoasudo b/resources/cocoasudo deleted file mode 100755 index ccf0bf8aa1..0000000000 Binary files a/resources/cocoasudo and /dev/null differ diff --git a/resources/kite-binaries.tar.gz b/resources/kite-binaries.tar.gz deleted file mode 100644 index 43215c64bd..0000000000 Binary files a/resources/kite-binaries.tar.gz and /dev/null differ diff --git a/resources/kite-dns/Dockerfile b/resources/kite-dns/Dockerfile deleted file mode 100644 index eeb3cb87b2..0000000000 --- a/resources/kite-dns/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Kite - -RUN apt-get update -RUN apt-get install -q -y dnsmasq wget psmisc - -RUN mkdir /app -WORKDIR /app -RUN wget https://github.com/jwilder/docker-gen/releases/download/0.3.2/docker-gen-linux-amd64-0.3.2.tar.gz -RUN tar xvzf docker-gen-linux-amd64-0.3.2.tar.gz -RUN rm docker-gen-linux-amd64-0.3.2.tar.gz - -ADD . /app - -ENV DOCKER_HOST unix:///tmp/docker.sock - -EXPOSE 53/udp -CMD ["sh", "/app/start"] \ No newline at end of file diff --git a/resources/kite-dns/dnsmasq.tmpl b/resources/kite-dns/dnsmasq.tmpl deleted file mode 100644 index 0355b257cc..0000000000 --- a/resources/kite-dns/dnsmasq.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -user=root -{{ range $index, $value := $ }} - {{ with $address := index $value.Addresses 0 }} -address=/{{$value.Name}}.kite/{{$address.IP}} - {{ end }} -{{ end }} diff --git a/resources/kite-dns/restart b/resources/kite-dns/restart deleted file mode 100644 index cfd46a988c..0000000000 --- a/resources/kite-dns/restart +++ /dev/null @@ -1,2 +0,0 @@ -killall dnsmasq -dnsmasq \ No newline at end of file diff --git a/resources/kite-dns/start b/resources/kite-dns/start deleted file mode 100644 index 66cbfcb602..0000000000 --- a/resources/kite-dns/start +++ /dev/null @@ -1 +0,0 @@ -/app/docker-gen -watch -only-exposed -notify "sh /app/restart" /app/dnsmasq.tmpl /etc/dnsmasq.conf \ No newline at end of file diff --git a/resources/unison b/resources/unison deleted file mode 100755 index 2716606974..0000000000 Binary files a/resources/unison and /dev/null differ diff --git a/script/run.sh b/script/run.sh index cecdce21f3..082715e725 100755 --- a/script/run.sh +++ b/script/run.sh @@ -3,8 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE=$DIR/.. -source $BASE/script/setup.sh - export ROOT_URL=https://localhost:3000 export DOCKER_HOST=http://192.168.59.103 export DOCKER_PORT=2375 diff --git a/script/setup.sh b/script/setup.sh index f16accf0fa..96b1022450 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -11,7 +11,7 @@ mkdir -p cache pushd cache -BOOT2DOCKER_CLI_VERSION=1.3.0 +BOOT2DOCKER_CLI_VERSION=1.3.1 BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION BOOT2DOCKER_CLI_FILE=boot2docker @@ -25,12 +25,6 @@ if [ ! -f $ATOM_SHELL_FILE ]; then unzip -d atom-shell $ATOM_SHELL_FILE fi -if [ ! -f kite-node-webkit.tar.gz ]; then - cecho "-----> Downloading node-webkit..." $purple - curl -L -o kite-node-webkit.tar.gz https://s3.amazonaws.com/kite-installer/kite-node-webkit.tar.gz - tar -zxf kite-node-webkit.tar.gz -C . -fi - if [ ! -f mongodb-osx-x86_64-2.6.3.tgz ]; then cecho "-----> Downloading mongodb..." $purple curl -L -o mongodb-osx-x86_64-2.6.3.tgz http://downloads.mongodb.org/osx/mongodb-osx-x86_64-2.6.3.tgz