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

Merge branch 'master' into rc0.2.0 

Conflicts:
	index.js
	meteor/.meteor/packages
	meteor/client/lib/apputil.js
	meteor/client/lib/boot2docker.js
	meteor/client/lib/docker.js
	meteor/client/lib/installer.js
	meteor/client/lib/router.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/lib/virtualbox.js
	meteor/client/views/dashboard/apps/dashboard-apps-settings.js
	meteor/client/views/dashboard/apps/dashboard-single-app.js
	meteor/client/views/dashboard/components/modal-create-image.js
	meteor/client/views/dashboard/images/dashboard-images-settings.js
	meteor/client/views/dashboard/setup/setup-install.html
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/client/views/dashboard/setup/setup-layout.html
	meteor/server/publications.js
	meteor/smart.json
	meteor/smart.lock
	package.json
	resources/install
	script/dist.sh
	script/setup.sh
	script/versions.sh
This commit is contained in:
Jeff Morgan 2014-09-10 22:28:26 -07:00
parent 98c2de58b3 bd339c8f5c
commit 31ed93283d
6 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.js
View File

@ -47,7 +47,11 @@ var start = function (callback) {
console.log('MongoDB: ' + mongoPort);
console.log('webPort: ' + webPort);
child_process.exec('kill $(ps aux -e | grep PURPOSE=KITEMATIC | awk \'{print $2}\') && rm ' + path.join(dataPath, 'mongod.lock'), function (error, stdout, stderr) {
<<<<<<< HEAD
var mongoChild = child_process.spawn(path.join(__dirname, 'resources', 'mongod'), ['--bind_ip', '127.0.0.1', '--dbpath', dataPath, '--port', mongoPort, '--unixSocketPrefix', dataPath], {
=======
var mongoChild = child_process.spawn(path.join(process.cwd(), 'resources', 'mongod'), ['--bind_ip', '127.0.0.1', '--dbpath', dataPath, '--port', mongoPort, '--unixSocketPrefix', dataPath], {
>>>>>>> master
env: {
PURPOSE: 'KITEMATIC'
}
@ -55,6 +59,7 @@ var start = function (callback) {
var started = false;
mongoChild.stdout.setEncoding('utf8');
mongoChild.stdout.on('data', function (data) {
console.log(data);
if (data.indexOf('waiting for connections on port ' + mongoPort)) {
if (!started) {
started = true;

1
meteor/client/lib/startup.js
View File

@ -13,7 +13,6 @@ Meteor.startup(function () {
console.log('Created Kitematic .images directory.');
fs.mkdirSync(Util.KITE_IMAGES_PATH);
}
if (!fs.existsSync(Util.getResourceDir())) {
fs.mkdirSync(Util.getResourceDir());
}

4
meteor/client/views/dashboard/apps/dashboard-single-app.html
View File

@ -22,7 +22,11 @@
<small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small>
</h5>
<div class="options">
{{#if $eq status 'STOPPED'}}
<a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
{{/if}}
{{#if $eq status 'READY'}}
<a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-stop"></span></a>
{{#if url}}
<a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a>
{{/if}}

8
meteor/client/views/dashboard/apps/dashboard-single-app.js
View File

@ -32,6 +32,14 @@ Template.dashboard_single_app.events({
AppUtil.stop(this._id);
$('.btn-icon').tooltip('hide');
},
'click .btn-start': function () {
AppUtil.start(this._id);
$('.btn-icon').tooltip('hide');
},
'click .btn-stop': function () {
AppUtil.stop(this._id);
$('.btn-icon').tooltip('hide');
},
'click .btn-restart': function () {
AppUtil.restart(this._id);
},

4
meteor/server/publications.js
View File

@ -7,9 +7,9 @@ Meteor.publish('images', function () {
});
Meteor.publish('installs', function () {
return Installs.find({});
return Installs.find();
});
Meteor.publish('settings', function () {
return Settings.find({});
return Settings.find();
});

11
script/versions.sh Normal file
View File

@ -0,0 +1,11 @@
BASE_IMAGE_VERSION=0.0.2
BASE_IMAGE_VERSION_FILE=base-images-$BASE_IMAGE_VERSION.tar.gz
BASE_IMAGE_FILE=base-images.tar.gz
VIRTUALBOX_FILE=virtualbox-4.3.14.pkg
BOOT2DOCKER_CLI_VERSION=1.2.0
BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
BOOT2DOCKER_CLI_FILE=boot2docker
COCOASUDO_FILE=cocoasudo