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

Clean test files, binaries

This commit is contained in:
Jeffrey Morgan 2015-02-26 13:58:30 -05:00
parent 068bb3e53d
commit e3d9de2d70
17 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTING.md
View File

@ -30,9 +30,6 @@ the preferred channel for [Bug Reports](#bug-reports), [Features Requests](#feat
and [Submitting Pull Requests](#submitting-pull-requests), but please respect the following and [Submitting Pull Requests](#submitting-pull-requests), but please respect the following
restrictions: restrictions:
* Please don't use the issue tracker for personal support requests. Our
[HipChat room](https://www.hipchat.com/giAT9Fqb5) is a better place to get help.
## Bug Reports ## Bug Reports
A bug is a _demonstrable problem_ that is caused by the code in the repository. A bug is a _demonstrable problem_ that is caused by the code in the repository.

0
__tests__/README.md → TESTING.md
View File

1
boot2docker- Executable file
View File

@ -0,0 +1 @@
{"error":"Not Found"}

19
browser/main.js
View File

@ -18,14 +18,6 @@ process.env.RESOURCES_PATH = __dirname + '/../resources';
process.chdir(path.join(__dirname, '..')); process.chdir(path.join(__dirname, '..'));
process.env.PATH = '/usr/local/bin:' + process.env.PATH; process.env.PATH = '/usr/local/bin:' + process.env.PATH;
if (argv.integration) {
process.env.TEST_TYPE = 'integration';
} else {
process.env.TEST_TYPE = 'test';
}
app.commandLine.appendSwitch('js-flags', '--harmony');
var mainWindow = null; var mainWindow = null;
var windowOptions = { var windowOptions = {
width: 1000, width: 1000,
@ -34,7 +26,7 @@ var windowOptions = {
'min-height': 700, 'min-height': 700,
resizable: true, resizable: true,
frame: false, frame: false,
show: true show: false
}; };
app.on('activate-with-no-open-windows', function () { app.on('activate-with-no-open-windows', function () {
@ -53,7 +45,7 @@ app.on('ready', function() {
mainWindow.loadUrl(path.normalize('file://' + path.join(__dirname, '..', 'build/index.html'))); mainWindow.loadUrl(path.normalize('file://' + path.join(__dirname, '..', 'build/index.html')));
app.on('will-quit', function () { app.on('will-quit', function () {
if (saveVMOnQuit) { if (saveVMOnQuit) {
exec('VBoxManage controlvm boot2docker-vm savestate', function () {}); exec('/usr/bin/VBoxManage controlvm boot2docker-vm savestate', function () {});
} }
}); });
} }
@ -64,17 +56,14 @@ app.on('ready', function() {
mainWindow.webContents.on('will-navigate', function (e, url) { mainWindow.webContents.on('will-navigate', function (e, url) {
if (url.indexOf('build/index.html#/containers') < 0) { if (url.indexOf('build/index.html#/containers') < 0) {
console.log(url);
e.preventDefault(); e.preventDefault();
} }
}); });
mainWindow.webContents.on('did-finish-load', function() { mainWindow.webContents.on('did-finish-load', function() {
if (!argv.test) {
mainWindow.show();
}
mainWindow.focus();
mainWindow.setTitle(''); mainWindow.setTitle('');
mainWindow.show();
mainWindow.focus();
// Auto Updates // Auto Updates
if (process.env.NODE_ENV !== 'development' && !argv.test) { if (process.env.NODE_ENV !== 'development' && !argv.test) {

10
gulpfile.js
View File

@ -1,3 +1,5 @@
var babel = require('gulp-babel');
var changed = require('gulp-changed');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var cssmin = require('gulp-cssmin'); var cssmin = require('gulp-cssmin');
var downloadatomshell = require('gulp-download-atom-shell'); var downloadatomshell = require('gulp-download-atom-shell');
@ -7,21 +9,19 @@ var gulpif = require('gulp-if');
var gutil = require('gulp-util'); var gutil = require('gulp-util');
var less = require('gulp-less'); var less = require('gulp-less');
var livereload = require('gulp-livereload'); var livereload = require('gulp-livereload');
var packagejson = require('./package.json');
var plumber = require('gulp-plumber'); var plumber = require('gulp-plumber');
var react = require('gulp-react'); var react = require('gulp-react');
var babel = require('gulp-babel');
var runSequence = require('run-sequence'); var runSequence = require('run-sequence');
var shell = require('gulp-shell'); var shell = require('gulp-shell');
var sourcemaps = require('gulp-sourcemaps'); var sourcemaps = require('gulp-sourcemaps');
var packagejson = require('./package.json');
var changed = require('gulp-changed');
var dependencies = Object.keys(packagejson.dependencies); var dependencies = Object.keys(packagejson.dependencies);
var isBeta = process.argv.indexOf('--beta') !== -1; var isBeta = process.argv.indexOf('--beta') !== -1;
var settings; var settings;
try { try {
settings = JSON.parse(fs.readFileSync('settings.json'), 'utf8'); settings = require('./settings.json');
} catch (err) { } catch (err) {
settings = {}; settings = {};
} }
@ -32,7 +32,7 @@ var options = {
beta: isBeta, beta: isBeta,
filename: isBeta ? 'Kitematic (Beta).app' : 'Kitematic.app', filename: isBeta ? 'Kitematic (Beta).app' : 'Kitematic.app',
name: isBeta ? 'Kitematic (Beta)' : 'Kitematic', name: isBeta ? 'Kitematic (Beta)' : 'Kitematic',
icon: isBeta ? 'kitematic-beta.icns' : 'kitematic.icns' icon: isBeta ? './util/kitematic-beta.icns' : './util/kitematic.icns'
}; };
gulp.task('js', function () { gulp.task('js', function () {

1
index.html
View File

@ -3,7 +3,6 @@
<head> <head>
<link rel="stylesheet" href="main.css"/> <link rel="stylesheet" href="main.css"/>
<meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self' http://localhost:35729; style-src 'self' 'unsafe-inline';"> <meta http-equiv="Content-Security-Policy" content="default-src *; script-src 'self' http://localhost:35729; style-src 'self' 'unsafe-inline';">
<title>Kitematic</title> <title>Kitematic</title>
</head> </head>
<body> <body>

6
package.json
View File

@ -15,7 +15,7 @@
"test": "jest", "test": "jest",
"release": "gulp release", "release": "gulp release",
"release:beta": "gulp release --beta", "release:beta": "gulp release --beta",
"preinstall": "./deps", "preinstall": "./util/deps",
"lint": "jsxhint src && jsxhint browser" "lint": "jsxhint src && jsxhint browser"
}, },
"licenses": [ "licenses": [
@ -25,8 +25,8 @@
} }
], ],
"jest": { "jest": {
"scriptPreprocessor": "<rootDir>/preprocessor.js", "scriptPreprocessor": "<rootDir>/util/preprocessor.js",
"setupEnvScriptFile": "<rootDir>/testenv.js", "setupEnvScriptFile": "<rootDir>/util/testenv.js",
"unmockedModulePathPatterns": [ "unmockedModulePathPatterns": [
"tty", "tty",
"net", "net",

15
src/Main.js
View File

@ -1,5 +1,15 @@
require.main.paths.splice(0, 0, process.env.NODE_PATH);
var remote = require('remote'); var remote = require('remote');
if (localStorage.getItem('settings.width') && localStorage.getItem('settings.height')) {
remote.getCurrentWindow().setSize(parseInt(localStorage.getItem('settings.width')), parseInt(localStorage.getItem('settings.height')));
remote.getCurrentWindow().center();
}
window.addEventListener('resize', function () {
localStorage.setItem('settings.width', window.innerWidth);
localStorage.setItem('settings.height', window.innerHeight);
});
require.main.paths.splice(0, 0, process.env.NODE_PATH);
var app = remote.require('app'); var app = remote.require('app');
var React = require('react'); var React = require('react');
var fs = require('fs'); var fs = require('fs');
@ -10,13 +20,13 @@ var boot2docker = require('./boot2docker');
var ContainerStore = require('./ContainerStore'); var ContainerStore = require('./ContainerStore');
var SetupStore = require('./SetupStore'); var SetupStore = require('./SetupStore');
var metrics = require('./Metrics'); var metrics = require('./Metrics');
var settingsjson;
var MenuTemplate = require('./MenuTemplate'); var MenuTemplate = require('./MenuTemplate');
var Menu = remote.require('menu'); var Menu = remote.require('menu');
var menu = Menu.buildFromTemplate(MenuTemplate); var menu = Menu.buildFromTemplate(MenuTemplate);
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);
var settingsjson;
try { try {
settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8')); settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8'));
} catch (err) { } catch (err) {
@ -73,7 +83,6 @@ setInterval(function () {
router.run(Handler => React.render(<Handler/>, document.body)); router.run(Handler => React.render(<Handler/>, document.body));
SetupStore.run().then(boot2docker.ip).then(ip => { SetupStore.run().then(boot2docker.ip).then(ip => {
console.log(ip);
docker.setHost(ip); docker.setHost(ip);
ContainerStore.init(function (err) { ContainerStore.init(function (err) {
if (err) { console.log(err); } if (err) { console.log(err); }

7
src/MenuTemplate.js
View File

@ -2,7 +2,6 @@ var remote = require('remote');
var app = remote.require('app'); var app = remote.require('app');
var path = require('path'); var path = require('path');
var docker = require('./Docker'); var docker = require('./Docker');
var BrowserWindow = remote.require('browser-window');
var router = require('./Router'); var router = require('./Router');
var util = require('./Util'); var util = require('./Util');
var metrics = require('./Metrics'); var metrics = require('./Metrics');
@ -124,7 +123,7 @@ var MenuTemplate = [
{ {
label: 'Toggle DevTools', label: 'Toggle DevTools',
accelerator: 'Alt+Command+I', accelerator: 'Alt+Command+I',
click: function() { BrowserWindow.getFocusedWindow().toggleDevTools(); } click: function() { remote.getCurrentWindow().getFocusedWindow().toggleDevTools(); }
}, },
] ]
}, },
@ -139,7 +138,9 @@ var MenuTemplate = [
{ {
label: 'Close', label: 'Close',
accelerator: 'Command+W', accelerator: 'Command+W',
selector: 'performClose:' click: function () {
remote.getCurrentWindow().hide();
}
}, },
{ {
type: 'separator' type: 'separator'

1
styles/main.less
View File

@ -21,6 +21,7 @@ html, body {
height: 100%; height: 100%;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
background: none;
-webkit-user-select: none; -webkit-user-select: none;
font-family: @font-regular; font-family: @font-regular;
cursor: default; cursor: default;

0
__tests__/util/VirtualBox_Uninstall.tool → util/VirtualBox_Uninstall.tool
View File

3
deps → util/deps
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BASE=$DIR/..
BOOT2DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['boot2docker-version']" "$(cat $BASE/package.json)") BOOT2DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['boot2docker-version']" "$(cat $BASE/package.json)")
BOOT2DOCKER_CLI_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION BOOT2DOCKER_CLI_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)") DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)")

0
kitematic-beta.icns → util/kitematic-beta.icns
View File

0
kitematic.icns → util/kitematic.icns
View File

0
preprocessor.js → util/preprocessor.js
View File

0
__tests__/util/reset → util/reset
View File

0
testenv.js → util/testenv.js
View File