docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
192 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

50 Commits

Author SHA1 Message Date
Jeff Morgan e8fe955cfd 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
 2014-09-10 22:28:26 -07:00
Jeff Morgan 22b1c3f873 Adding setup page for usage diagnostics 2014-09-10 19:39:25 -07:00
Sean Li 0da48eb8bd Moved server code to the client side for performance. 2014-09-03 18:17:46 -07:00
Sean Li 29fbc0cb58 Moved server code to the client side for performance. 2014-09-03 18:17:46 -07:00
Jeff Morgan 37f19c97f8 Fixing DNS issues, should have been .kite and not .dev 2014-09-02 03:40:29 -07:00
Jeff Morgan a9b6812338 Fixing DNS issues, should have been .kite and not .dev 2014-09-02 03:40:29 -07:00
Jeff Morgan b66bbc2c0d Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix 
Conflicts:
	meteor/client/lib/boot2docker.js
	meteor/client/lib/utilities.js
	meteor/client/lib/virtualbox.js
	meteor/client/main.js
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/server/docker.js
 2014-09-01 04:00:06 -07:00
Jeff Morgan f5b784491c Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix 
Conflicts:
	meteor/client/lib/boot2docker.js
	meteor/client/lib/utilities.js
	meteor/client/lib/virtualbox.js
	meteor/client/main.js
	meteor/client/views/dashboard/setup/setup-install.js
	meteor/server/docker.js
 2014-09-01 04:00:06 -07:00
Jeff Morgan adff625795 Fixing common installer bugs 2014-09-01 03:25:31 -07:00
Jeff Morgan 0bedb1902e Fixing common installer bugs 2014-09-01 03:25:31 -07:00
Sean Li 3de35964da JSHint. 2014-09-01 02:23:18 -07:00
Sean Li c00fe7b630 JSHint. 2014-09-01 02:23:18 -07:00
Sean Li 3d615fd776 Refactored image code. 2014-09-01 02:15:00 -07:00
Sean Li 63148c2d9c Refactored image code. 2014-09-01 02:15:00 -07:00
Sean Li 72271a3d20 Refactored app code. 2014-09-01 00:59:32 -07:00
Sean Li 50d3629758 Refactored app code. 2014-09-01 00:59:32 -07:00
Sean Li c299ef3a07 Refactored code and fixed bin dir path issue. 2014-08-31 22:10:32 -07:00
Sean Li dc8cb18fa6 Refactored code and fixed bin dir path issue. 2014-08-31 22:10:32 -07:00
Sean Li 1cc0d3acd4 Moved server utilities. 2014-08-31 21:08:21 -07:00
Sean Li aa6ac2a4d5 Moved server utilities. 2014-08-31 21:08:21 -07:00
Sean Li 5a00677cca Refactored utilities. 2014-08-31 21:07:22 -07:00
Sean Li b3cc727dbb Refactored utilities. 2014-08-31 21:07:22 -07:00
Sean Li e8c6b8d68f Refactored app code into hooks. 2014-08-31 20:27:49 -07:00
Sean Li eb46a9dee4 Refactored app code into hooks. 2014-08-31 20:27:49 -07:00
Sean Li b459247ea4 Moved kite functions to utilities. 2014-08-31 19:56:18 -07:00
Sean Li e59c03d620 Moved kite functions to utilities. 2014-08-31 19:56:18 -07:00
Sean Li da26b980f6 Moved basic Docker operations to namespace. 2014-08-31 19:18:11 -07:00
Sean Li 9d5fa7ad69 Moved basic Docker operations to namespace. 2014-08-31 19:18:11 -07:00
Sean Li fbc2a8e7c8 Fixed bug with loading default containers. 2014-08-29 14:08:13 -07:00
Sean Li 3817e346df Fixed bug with loading default containers. 2014-08-29 14:08:13 -07:00
Sean Li 0a88eea3d2 JSHint. 2014-08-29 10:52:42 -07:00
Sean Li 192436c1d6 JSHint. 2014-08-29 10:52:42 -07:00
Jeff Morgan b59d56457d Merge branch 'master' of github.com:kitematic/kitematic 
Conflicts:
	README.md
	meteor/server/docker.js
 2014-08-28 21:57:44 -07:00
Jeff Morgan 678165cf30 Merge branch 'master' of github.com:kitematic/kitematic 
Conflicts:
	README.md
	meteor/server/docker.js
 2014-08-28 21:57:44 -07:00
Jeff Morgan 2cb401684d Moving Sync to client side 2014-08-28 21:56:08 -07:00
Sean Li 6dd6cf6c7a Fixed crash when restarting app. 2014-08-28 19:52:58 -07:00
Sean Li 06c4afec93 Fixed crash when restarting app. 2014-08-28 19:52:58 -07:00
Sean Li 7ae039108f Fixed crash when deleting old images. 2014-08-28 19:47:13 -07:00
Sean Li 5038b2e5e8 Fixed crash when deleting old images. 2014-08-28 19:47:13 -07:00
Sean Li ed80c00df7 Displays host url and ports properly in app settings. 2014-08-28 19:27:56 -07:00
Sean Li 937e29fc12 Displays host url and ports properly in app settings. 2014-08-28 19:27:56 -07:00
Sean Li e55f16dd04 Does not run pulling again if image already exists. 2014-08-28 00:39:34 -07:00
Sean Li d0c6939ad6 Does not run pulling again if image already exists. 2014-08-28 00:39:34 -07:00
Jeff Morgan 9a3ee1e363 Merge branch 'master' of github.com:kitematic/kitematic 2014-08-27 18:13:28 -07:00
Jeff Morgan aa0bf724ae Adding Node.js 0.10.29 into the bundle so the server portion runs 
separately. Fixing DNS caching bug using dig.
 2014-08-27 18:12:55 -07:00
Sean Li 9a38c16970 Fixed bug caused by spaces in FROM instruction. 2014-08-27 18:11:08 -07:00
Sean Li f103b9cf43 Fixed crash when getting container data. 2014-08-27 17:03:37 -07:00
Sean Li 2af8f51b2e Fixed crashes when converting volume data and syncing. 2014-08-27 16:57:20 -07:00
Jeff Morgan 740efe16d1 Fixing install bugs 2014-08-27 16:04:32 -07:00
Jeff Morgan bdf0949190 Initial commit 2014-08-27 13:45:22 -07:00