docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kitematic/kitematic

This commit is contained in:
Alexandre Vazquez 2016-03-26 20:37:39 +01:00
parent 83c1940741 5e0356659d
commit cac4c6fbae
32 changed files with 265 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -91,7 +91,7 @@ module.exports = function (grunt) {
'FileDescription': WINDOWS_APPNAME,
'InternalName': BASENAME + '.exe',
'OriginalFilename': BASENAME + '.exe',
'LegalCopyright': 'Copyright 2015 Docker Inc. All rights reserved.'
'LegalCopyright': 'Copyright 2015-2016 Docker Inc. All rights reserved.'
}
}
}

2
LICENSE
View File

@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2014-2015 Docker, Inc.
Copyright 2014-2016 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

9
Makefile
View File

@ -5,6 +5,11 @@ run:
npm install
npm run
# Get the IP ADDRESS
DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
HUGO_BIND_IP=0.0.0.0
# import the existing docs build cmds from docker/docker
DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
DOCSPORT := 8000
@ -13,7 +18,9 @@ DOCKER_DOCS_IMAGE := kitematic-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT)
docs: docs-build
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" mkdocs serve
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" \
hugo server \
--port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
docs-shell: docs-build
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash

4
circle.yml
View File

@ -11,5 +11,5 @@ deployment:
tag: /v.*/
owner: docker
commands:
- github-release upload --user docker --repo kitematic --tag $CIRCLE_TAG --file release/Kitematic-Mac.zip --name Kitematic-Mac.zip
- github-release upload --user docker --repo kitematic --tag $CIRCLE_TAG --file release/Kitematic-Windows.zip --name Kitematic-Windows.zip
- github-release upload --user docker --repo kitematic --tag $CIRCLE_TAG --file release/Kitematic-Mac.zip --name Kitematic-$(echo $CIRCLE_TAG | cut -c2-)-Mac.zip
- github-release upload --user docker --repo kitematic --tag $CIRCLE_TAG --file release/Kitematic-Windows.zip --name Kitematic-$(echo $CIRCLE_TAG | cut -c2-)-Windows.zip

3
docs/Dockerfile
View File

@ -5,9 +5,10 @@ RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/comp
RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/docker
RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content
RUN svn checkout https://github.com/docker/notary/trunk/docs /docs/content/notary
RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/opensource
RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
ENV PROJECT=kitematic
# To get the git info for this repo

2
docs/faq.md
View File

@ -4,7 +4,7 @@ title = "Frequently Asked Questions"
description = "Documentation covering common questions users have about Kitematic"
keywords = ["docker, documentation, about, technology, kitematic, gui"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
weight=5
+++
<![end-metadata]-->

3
docs/index.md
View File

@ -4,7 +4,8 @@ title = "Kitematic"
description = "Documentation that provides an overview of Kitematic and installation instructions"
keywords = ["docker, documentation, about, technology, kitematic, gui"]
[menu.main]
parent="mn_install"
identifier="toolbox_kitematic"
parent="workw_toolbox"
weight=2
+++
<![end-metadata]-->

2
docs/known-issues.md
View File

@ -4,7 +4,7 @@ title = "Known Issues"
description = "Information about known issues in Kitematic"
keywords = ["docker, documentation, about, technology, kitematic, gui"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
weight=5
+++
<![end-metadata]-->

2
docs/minecraft-server.md
View File

@ -4,7 +4,7 @@ title = "Set up a Minecraft Server"
description = "Tutorial demonstrating the setup of a Minecraft server using Docker and Kitematic"
keywords = ["docker, documentation, about, technology, kitematic, gui, minecraft, tutorial"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
weight=2
+++
<![end-metadata]-->

2
docs/nginx-web-server.md
View File

@ -4,7 +4,7 @@ title = "Set up an Nginx web server"
description = "Tutorial demonstrating the setup of an Nginx web server using Docker and Kitematic"
keywords = ["docker, documentation, about, technology, kitematic, gui, nginx, tutorial"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
weight=1
+++
<![end-metadata]-->

2
docs/rethinkdb-dev-database.md
View File

@ -4,7 +4,7 @@ title = "Creating a Local RethinkDB Database for Development"
description = "Tutorial demonstrating the setup of an RethinkDB database for development"
keywords = ["docker, documentation, about, technology, kitematic, gui, rethink, tutorial"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
weight=3
+++
<![end-metadata]-->

2
docs/userguide.md
View File

@ -4,7 +4,7 @@ title = "Kitematic User Guide: Intro & Overview"
description = "Documentation that provides an overview of Kitematic and installation instructions"
keywords = ["docker, documentation, about, technology, kitematic, gui"]
[menu.main]
parent="smn_workw_kitematic"
parent="toolbox_kitematic"
+++
<![end-metadata]-->

3
jest-unit.json
View File

@ -13,6 +13,7 @@
"object-assign",
"underscore",
"source-map-support",
"<rootDir>/node_modules/.*JSONStream"
"<rootDir>/node_modules/.*JSONStream",
"<rootDir>/node_modules/core-js"
]
}

5
package.json
View File

@ -1,6 +1,6 @@
{
"name": "Kitematic",
"version": "0.9.5",
"version": "0.10.0",
"author": "Kitematic",
"description": "Simple Docker Container management for Mac OS X.",
"homepage": "https://kitematic.com/",
@ -16,13 +16,11 @@
"test": "jest -c jest-unit.json",
"integration": "jest -c jest-integration.json",
"release": "grunt release",
"release-mac": "grunt release-mac",
"lint": "jsxhint src"
},
"license": "Apache-2.0",
"electron-version": "0.35.4",
"dependencies": {
"JSONStream": "^1.0.7",
"alt": "^0.16.2",
"ansi-to-html": "0.3.0",
"any-promise": "^0.1.0",
@ -35,6 +33,7 @@
"dockerode": "^2.2.7",
"install": "^0.1.8",
"jquery": "^2.1.3",
"JSONStream": "^1.0.7",
"mixpanel": "kitematic/mixpanel-node",
"mkdirp": "^0.5.0",
"node-uuid": "^1.4.3",

61
resources/terminal
View File

@ -15,22 +15,49 @@ EOF`
function open_iterm () {
osascript > /dev/null <<EOF
tell application "iTerm"
activate
try
tell the first terminal
launch session "Default Session"
tell the last session
write text "bash -c \"$CMD\""
end tell
end tell
on error
tell (make new terminal)
launch session "Default Session"
tell the last session
write text "bash -c \"$CMD\""
end tell
end tell
end try
if version < 2.9 then
activate
try
tell current window
create tab with default profile
tell the current session of current window
write text "bash -c \"$CMD\""
end tell
end tell
on error
try
tell the first terminal
launch session "Default Session"
tell the last session
write text "bash -c \"$CMD\""
end tell
end tell
on error
tell (make new terminal)
launch session "Default Session"
tell the last session
write text "bash -c \"$CMD\""
end tell
end tell
end try
end try
end if
end tell
EOF
}
function open_iterm2point9 () {
osascript > /dev/null <<EOF
tell application "iTerm"
if version ≥ 2.9 then
activate
tell current window
create tab with default profile
tell first session of current tab
write text "bash -c \"$CMD\""
end tell
end tell
end if
end tell
EOF
}
@ -47,7 +74,7 @@ EOF
}
if [ "$ITERM_EXISTS" == "true" ]; then
open_iterm "$@" || open_terminal "$@"
open_iterm2point9 "$@" || open_iterm "$@" || open_terminal "$@"
else
open_terminal "$@"
fi

5
src/actions/SetupActions.js
View File

@ -6,6 +6,11 @@ class SetupActions {
this.dispatch({removeVM});
setupUtil.retry(removeVM);
}
useVbox () {
this.dispatch({});
setupUtil.useVbox();
}
}
export default alt.createActions(SetupActions);

1
src/app.js
View File

@ -1,4 +1,5 @@
require.main.paths.splice(0, 0, process.env.NODE_PATH);
import electron from 'electron';
const remote = electron.remote;
const Menu = remote.Menu;

8
src/browser.js
View File

@ -4,18 +4,20 @@ const BrowserWindow = electron.BrowserWindow;
import fs from 'fs';
import os from 'os';
import path from 'path';
import child_process from 'child_process';
process.env.NODE_PATH = path.join(__dirname, 'node_modules');
process.env.RESOURCES_PATH = path.join(__dirname, '/../resources');
process.env.PATH = '/usr/local/bin:' + process.env.PATH;
if (process.platform !== 'win32') {
process.env.PATH = '/usr/local/bin:' + process.env.PATH;
}
var size = {}, settingsjson = {};
try {
size = JSON.parse(fs.readFileSync(path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size')));
size = JSON.parse(fs.readFileSync(path.join(app.getPath('userData'), 'size')));
} catch (err) {}
try {
settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, 'settings.json'), 'utf8'));
} catch (err) {}

2
src/components/ContainerHome.react.js
View File

@ -52,7 +52,7 @@ var ContainerHome = React.createClass({
if (this.props.container.Error) {
body = (
<div className="details-progress error">
<h2>We&#39;re sorry. There seem to be an error:</h2>
<h2>We&#39;re sorry. There seems to be an error:</h2>
<p className="error-message">{this.props.container.Error}</p>
<p>If this error is invalid, please file a ticket on our Github repo.</p>
<a className="btn btn-action" onClick={this.handleErrorClick}>File Ticket</a>

1
src/components/ContainerHomeFolders.react.js
View File

@ -32,6 +32,7 @@ var ContainerHomeFolder = React.createClass({
mounts.forEach(m => {
if (m.Destination === destination) {
m.Source = util.windowsToLinuxPath(newSource);
m.Driver = null;
}
});

2
src/components/ContainerListItem.react.js
View File

@ -97,7 +97,7 @@ var ContainerListItem = React.createClass({
return (
<Router.Link to="container" params={{name: container.Name}}>
<li onMouseEnter={self.handleItemMouseEnter} onMouseLeave={self.handleItemMouseLeave} onClick={self.handleClick}>
<li onMouseEnter={self.handleItemMouseEnter} onMouseLeave={self.handleItemMouseLeave} onClick={self.handleClick} id={this.props.key}>
{state}
<div className="info">
<div className="name">

6
src/components/ContainerSettingsVolumes.react.js
View File

@ -28,7 +28,7 @@ var ContainerSettingsVolumes = React.createClass({
metrics.track('Choose Directory for Volume');
var mounts = _.clone(this.props.container.Mounts);
let mounts = _.clone(this.props.container.Mounts);
_.each(mounts, m => {
if (m.Destination === dockerVol) {
m.Source = util.windowsToLinuxPath(directory);
@ -36,7 +36,7 @@ var ContainerSettingsVolumes = React.createClass({
}
});
var binds = mounts.map(m => {
let binds = mounts.map(m => {
return m.Source + ':' + m.Destination;
});
@ -50,7 +50,7 @@ var ContainerSettingsVolumes = React.createClass({
from: 'settings'
});
var mounts = _.clone(this.props.container.Mounts);
let mounts = _.clone(this.props.container.Mounts);
_.each(mounts, m => {
if (m.Destination === dockerVol) {
m.Source = null;

46
src/components/Containers.react.js
View File

@ -26,7 +26,7 @@ var Containers = React.createClass({
containerStore.listen(this.update);
},
componentDidUnmount: function () {
componentWillUnmount: function () {
containerStore.unlisten(this.update);
},
@ -106,43 +106,7 @@ var Containers = React.createClass({
metrics.track('Opened Issue Reporter', {
from: 'app'
});
shell.openExternal('https://github.com/kitematic/kitematic/issues/new');
},
handleMouseEnterDockerTerminal: function () {
this.setState({
currentButtonLabel: 'Open terminal to use Docker command line.'
});
},
handleMouseLeaveDockerTerminal: function () {
this.setState({
currentButtonLabel: ''
});
},
handleMouseEnterReportIssue: function () {
this.setState({
currentButtonLabel: 'Report an issue or suggest feedback.'
});
},
handleMouseLeaveReportIssue: function () {
this.setState({
currentButtonLabel: ''
});
},
handleMouseEnterPreferences: function () {
this.setState({
currentButtonLabel: 'Change app preferences.'
});
},
handleMouseLeavePreferences: function () {
this.setState({
currentButtonLabel: ''
});
shell.openExternal('https://github.com/docker/kitematic/issues/new');
},
render: function () {
@ -169,9 +133,9 @@ var Containers = React.createClass({
<ContainerList containers={this.state.sorted} newContainer={this.state.newContainer} />
</section>
<section className="sidebar-buttons">
<span className="btn-sidebar btn-terminal" onClick={this.handleClickDockerTerminal} onMouseEnter={this.handleMouseEnterDockerTerminal} onMouseLeave={this.handleMouseLeaveDockerTerminal}><span className="icon icon-docker-cli"></span><span className="text">DOCKER CLI</span></span>
<span className="btn-sidebar btn-feedback" onClick={this.handleClickReportIssue} onMouseEnter={this.handleMouseEnterDockerTerminal} onMouseLeave={this.handleMouseLeaveDockerTerminal}><span className="icon icon-feedback"></span></span>
<span className="btn-sidebar btn-preferences" onClick={this.handleClickPreferences} onMouseEnter={this.handleMouseEnterDockerTerminal} onMouseLeave={this.handleMouseLeaveDockerTerminal}><span className="icon icon-preferences"></span></span>
<span className="btn-sidebar btn-terminal" onClick={this.handleClickDockerTerminal} ><span className="icon icon-docker-cli"></span><span className="text">DOCKER CLI</span></span>
<span className="btn-sidebar btn-feedback" onClick={this.handleClickReportIssue} ><span className="icon icon-feedback"></span></span>
<span className="btn-sidebar btn-preferences" onClick={this.handleClickPreferences} ><span className="icon icon-preferences"></span></span>
</section>
</div>
<Router.RouteHandler pending={this.state.pending} containers={this.state.containers} container={container}/>

6
src/components/ImageCard.react.js
View File

@ -76,11 +76,11 @@ var ImageCard = React.createClass({
$tagOverlay.fadeOut(300);
},
handleRepoClick: function () {
var repoUri = 'https://registry.hub.docker.com/';
var repoUri = 'https://hub.docker.com/';
if (this.props.image.namespace === 'library') {
repoUri = repoUri + '_/' + this.props.image.name;
} else {
repoUri = repoUri + 'u/' + this.props.image.namespace + '/' + this.props.image.name;
repoUri = repoUri + 'r/' + this.props.image.namespace + '/' + this.props.image.name;
}
shell.openExternal(repoUri);
},
@ -105,6 +105,8 @@ var ImageCard = React.createClass({
var description;
if (this.props.image.description) {
description = this.props.image.description;
} else if(this.props.image.short_description){
description = this.props.image.short_description;
} else {
description = "No description.";
}

1
src/components/NewContainerSearch.react.js
View File

@ -73,7 +73,6 @@ module.exports = React.createClass({
nextPage = (page + 1 > this.state.totalPage) ? this.state.totalPage : page + 1;
totalPage = this.state.totalPage;
}
this.setState({
query: query,
loading: true,

41
src/components/Setup.react.js
View File

@ -3,12 +3,13 @@ import Router from 'react-router';
import Radial from './Radial.react.js';
import RetinaImage from 'react-retina-image';
import Header from './Header.react';
import Util from '../utils/Util';
import util from '../utils/Util';
import metrics from '../utils/MetricsUtil';
import setupStore from '../stores/SetupStore';
import setupActions from '../actions/SetupActions';
import shell from 'shell';
var Setup = React.createClass({
mixins: [Router.Navigation],
@ -20,7 +21,7 @@ var Setup = React.createClass({
setupStore.listen(this.update);
},
componentDidUnmount: function () {
componentWillUnmount: function () {
setupStore.unlisten(this.update);
},
@ -32,6 +33,10 @@ var Setup = React.createClass({
setupActions.retry(false);
},
handleUseVbox: function () {
setupActions.useVbox();
},
handleErrorRemoveRetry: function () {
console.log('Deleting VM and trying again.' );
setupActions.retry(true);
@ -63,6 +68,12 @@ var Setup = React.createClass({
},
renderProgress: function () {
let title = 'Starting Docker VM';
let descr = 'To run Docker containers on your computer, Kitematic is starting a Linux virtual machine. This may take a minute...';
if (util.isNative()) {
title = 'Checking Docker';
descr = 'To run Docker containers on your computer, Kitematic is checking the Docker connection.';
}
return (
<div className="setup">
<Header hideLogin={true}/>
@ -72,8 +83,8 @@ var Setup = React.createClass({
</div>
<div className="desc">
<div className="content">
<h1>Starting Docker VM</h1>
<p>To run Docker containers on your computer, Kitematic is starting a Linux virtual machine. This may take a minute...</p>
<h1>{title}</h1>
<p>{descr}</p>
</div>
</div>
</div>
@ -84,22 +95,24 @@ var Setup = React.createClass({
renderError: function () {
let deleteVmAndRetry;
if (Util.isLinux()) {
if (util.isLinux()) {
if (!this.state.started) {
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleLinuxDockerInstall}>Install Docker</button>
);
}
} else if (util.isNative()) {
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleUseVbox}>Use VirtualBox</button>
);
} else if (this.state.started) {
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleErrorRemoveRetry}>Delete VM &amp; Retry Setup</button>
);
} else {
if (this.state.started) {
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleErrorRemoveRetry}>Delete VM &amp; Retry Setup</button>
);
} else {
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleToolBox}>Get Toolbox</button>
);
}
deleteVmAndRetry = (
<button className="btn btn-action" onClick={this.handleToolBox}>Get Toolbox</button>
);
}
return (
<div className="setup">

9
src/utils/DockerMachineUtil.js
View File

@ -158,11 +158,12 @@ var DockerMachine = {
}
});
});
} else if (util.isLinux()) {
} else if (util.isNative()) {
cmd = cmd || process.env.SHELL;
var terminal = util.linuxTerminal();
if (terminal)
util.execFile(terminal.concat([cmd])).then(() => {});
var terminal = util.isLinux() ? util.linuxTerminal() : path.join(process.env.RESOURCES_PATH, 'terminal');
if (terminal) {
util.execFile([terminal, cmd]).then(() => {});
}
} else {
cmd = cmd || process.env.SHELL;
this.url(machineName).then(machineUrl => {

52
src/utils/DockerUtil.js
View File

@ -11,6 +11,9 @@ import containerServerActions from '../actions/ContainerServerActions';
import rimraf from 'rimraf';
import stream from 'stream';
import JSONStream from 'JSONStream';
import Promise from 'bluebird';
export default {
host: null,
@ -20,20 +23,23 @@ export default {
activeContainerName: null,
setup (ip, name) {
if (!ip || !name) {
if (!ip && !name) {
throw new Error('Falsy ip or name passed to docker client setup');
}
this.host = ip;
if (util.isLinux()) {
this.host = 'localhost';
this.client = new dockerode({socketPath: '/var/run/docker.sock'});
if (ip.indexOf('local') !== -1) {
try {
this.client = new dockerode({socketPath: '/var/run/docker.sock'});
} catch (error) {
throw new Error('Cannot connect to the Docker daemon. Is the daemon running?');
}
} else {
let certDir = path.join(util.home(), '.docker/machine/machines/', name);
if (!fs.existsSync(certDir)) {
throw new Error('Certificate directory does not exist');
}
this.host = ip;
this.client = new dockerode({
protocol: 'https',
host: ip,
@ -45,6 +51,28 @@ export default {
}
},
async version () {
let version = null;
let maxRetries = 10;
let retries = 0;
let error_message = "";
while (version == null && retries < maxRetries) {
this.client.version((error,data) => {
if (!error) {
version = data.Version;
} else {
error_message = error;
}
retries++;
});
await Promise.delay(1000);
}
if (version == null) {
throw new Error(error_message);
}
return version;
},
init () {
this.placeholders = JSON.parse(localStorage.getItem('placeholders')) || {};
this.fetchAllContainers();
@ -88,6 +116,7 @@ export default {
container.start((error) => {
if (error) {
containerServerActions.error({name, error});
console.log('error starting: %o - %o', name, error);
return;
}
containerServerActions.started({name, error});
@ -118,7 +147,12 @@ export default {
containerData.PublishAllPorts = true;
}
containerData.Cmd = image.Config.Cmd || image.Config.Entrypoint || 'bash';
if (image.Config.Cmd) {
containerData.Cmd = image.Config.Cmd;
} else if (!image.Config.Entrypoint) {
containerData.Cmd = 'bash';
}
let existing = this.client.getContainer(name);
existing.kill(() => {
existing.remove(() => {
@ -151,6 +185,7 @@ export default {
fetchAllContainers () {
this.client.listContainers({all: true}, (err, containers) => {
if (err) {
console.error(err);
return;
}
async.map(containers, (container, callback) => {
@ -166,6 +201,7 @@ export default {
containers = containers.filter(c => c !== null);
if (err) {
// TODO: add a global error handler for this
console.error(err);
return;
}
containerServerActions.allUpdated({containers: _.indexBy(containers.concat(_.values(this.placeholders)), 'Name')});
@ -362,6 +398,8 @@ export default {
timestamps: 1
}, (err, logStream) => {
if (err) {
// socket hang up can be captured
console.error(err);
return;
}
@ -388,6 +426,8 @@ export default {
timestamps: 1
}, (err, logStream) => {
if (err) {
// Socket hang up also can be found here
console.error(err);
return;
}

91
src/utils/SetupUtil.js
View File

@ -11,8 +11,14 @@ import machine from './DockerMachineUtil';
import docker from './DockerUtil';
import router from '../router';
// Docker Machine exits with 3 to differentiate pre-create check failures (e.g.
// virtualization isn't enabled) from normal errors during create (exit code
// 1).
const precreateCheckExitCode = 3;
let _retryPromise = null;
let _timers = [];
let useNative = util.isNative() ? util.isNative() : true;
export default {
simulateProgress (estimateSeconds) {
@ -31,12 +37,21 @@ export default {
_timers = [];
},
async useVbox () {
metrics.track('Retried Setup with VBox');
localStorage.setItem('settings.useNative', false);
router.get().transitionTo('loading');
setupServerActions.error({ error: { message: null }});
_retryPromise.resolve();
},
retry (removeVM) {
metrics.track('Retried Setup', {
removeVM
});
router.get().transitionTo('loading');
setupServerActions.error({ error: { message: null }});
if (removeVM) {
machine.rm().finally(() => {
_retryPromise.resolve();
@ -51,30 +66,44 @@ export default {
return _retryPromise.promise;
},
setup() {
return util.isLinux() ? this.nativeSetup() : this.nonNativeSetup();
async setup () {
while (true) {
try {
if (util.isNative()) {
localStorage.setItem('setting.useNative', true);
let stats = fs.statSync('/var/run/docker.sock');
if (stats.isSocket()) {
await this.nativeSetup();
} else {
throw new Error('File found is not a socket');
}
} else {
await this.nonNativeSetup();
}
return;
} catch (error) {
metrics.track('Native Setup Failed');
setupServerActions.error({error});
bugsnag.notify('Native Setup Failed', error.message, {
'Docker Error': error.message
}, 'info');
this.clearTimers();
await this.pause();
}
}
},
async nativeSetup () {
while (true) {
try {
docker.setup('localhost', machine.name());
docker.isDockerRunning();
break;
} catch (error) {
router.get().transitionTo('setup');
metrics.track('Native Setup Failed');
setupServerActions.error({error});
let message = error.message.split('\n');
let lastLine = message.length > 1 ? message[message.length - 2] : 'Docker Machine encountered an error.';
bugsnag.notify('Native Setup Failed', lastLine, {
'Docker Machine Logs': error.message
}, 'info');
this.clearTimers();
await this.pause();
docker.setup(util.isLinux() ? 'localhost':'docker.local');
setupServerActions.started({started: true});
this.simulateProgress(20);
return docker.version();
} catch (error) {
throw new Error(error);
}
}
},
@ -86,7 +115,7 @@ export default {
try {
setupServerActions.started({started: false});
// Make sure virtulBox and docker-machine are installed
// Make sure virtualBox and docker-machine are installed
let virtualBoxInstalled = virtualBox.installed();
let machineInstalled = machine.installed();
if (!virtualBoxInstalled || !machineInstalled) {
@ -122,13 +151,16 @@ export default {
} else {
let state = await machine.status();
if (state !== 'Running') {
router.get().transitionTo('setup');
setupServerActions.started({started: true});
if (state === 'Saved') {
router.get().transitionTo('setup');
this.simulateProgress(10);
} else if (state === 'Stopped') {
router.get().transitionTo('setup');
this.simulateProgress(25);
} else {
this.simulateProgress(40);
}
await machine.start();
}
}
@ -146,6 +178,7 @@ export default {
if (ip) {
docker.setup(ip, machine.name());
await docker.version();
} else {
throw new Error('Could not determine IP from docker-machine.');
}
@ -154,11 +187,17 @@ export default {
} catch (error) {
router.get().transitionTo('setup');
let novtx = error.message.indexOf('This computer doesn\'t have VT-X/AMD-v enabled') !== -1;
metrics.track(novtx ? 'Setup Halted' : 'Setup Failed', {
virtualBoxVersion,
machineVersion
});
if (error.code === precreateCheckExitCode) {
metrics.track('Setup Halted', {
virtualBoxVersion,
machineVersion
});
} else {
metrics.track('Setup Failed', {
virtualBoxVersion,
machineVersion
});
}
let message = error.message.split('\n');
let lastLine = message.length > 1 ? message[message.length - 2] : 'Docker Machine encountered an error.';

29
src/utils/Util.js
View File

@ -13,7 +13,7 @@ module.exports = {
return new Promise((resolve, reject) => {
child_process.execFile(args[0], args.slice(1), options, (error, stdout) => {
if (error) {
reject(new Error('Encountered an error: ' + error));
reject(error);
} else {
resolve(stdout);
}
@ -37,6 +37,24 @@ module.exports = {
isLinux: function () {
return process.platform === 'linux';
},
isNative: function () {
// let native = JSON.parse(localStorage.getItem('settings.useNative'));
let native = null;
if (native === null) {
try {
// Check if file exists
fs.statSync('/var/run/docker.sock');
native = true;
} catch (e) {
if (this.isLinux()) {
native = true;
} else {
native = false;
}
}
}
return native;
},
binsPath: function () {
return this.isWindows() ? path.join(this.home(), 'Kitematic-bins') : path.join('/usr/local/bin');
},
@ -62,9 +80,6 @@ module.exports = {
// TODO: fix me for windows 7
return 'Documents';
},
supportDir: function () {
return app.getPath('userData');
},
CommandOrCtrl: function () {
return this.isWindows() ? 'Ctrl' : 'Command';
},
@ -95,7 +110,7 @@ module.exports = {
// An official repo is alphanumeric characters separated by dashes or
// underscores.
// Examples: myrepo, my-docker-repo, my_docker_repo
// Non-exapmles: mynamespace/myrepo, my%!repo
// Non-examples: mynamespace/myrepo, my%!repo
var repoRegexp = /^[a-z0-9]+(?:[._-][a-z0-9]+)*$/;
return repoRegexp.test(name);
},
@ -166,9 +181,9 @@ module.exports = {
dialog.showMessageBox({
type: 'warning',
buttons: ['OK'],
message: 'The terminal emulator symbolic link doesn\'t exists. Please read the Wiki at https://github.com/kitematic/kitematic/wiki/Common-Issues-and-Fixes#early-linux-support-from-zedtux.'
message: 'The terminal emulator symbolic link doesn\'t exists. Please read the Wiki at https://github.com/docker/kitematic/wiki/Early-Linux-Support.'
});
return;
return false;
}
},
webPorts: ['80', '8000', '8080', '8888', '3000', '5000', '2368', '9200', '8983']

6
src/utils/VirtualBoxUtil.js
View File

@ -39,9 +39,9 @@ var VirtualBox = {
return util.execFile([this.command(), 'sharedfolder', 'add', vmName, '--name', pathName, '--hostpath', hostPath, '--automount']);
},
vmExists: function (name) {
return util.execFile([this.command(), 'showvminfo', name]).then(() => {
return true;
}).catch((err) => {
return util.execFile([this.command(), 'list', 'vms']).then(out => {
return out.indexOf('"' + name + '"') !== -1;
}).catch(() => {
return false;
});
}

2
src/utils/WebUtil.js
View File

@ -10,7 +10,7 @@ import metrics from './MetricsUtil';
var WebUtil = {
addWindowSizeSaving: function () {
window.addEventListener('resize', function () {
fs.writeFileSync(path.join(util.supportDir(), 'size'), JSON.stringify({
fs.writeFileSync(path.join(app.getPath('userData'), 'size'), JSON.stringify({
width: window.outerWidth,
height: window.outerHeight
}));