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

222 Commits

Author SHA1 Message Date
Jeffrey Morgan 9603e0dbde Merge branch 'master' of github.com:docker/toolbox 2015-08-13 08:47:07 -07:00
Jeffrey Morgan 5d88c0e072 Fix requirement detection to 10.8 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-13 08:47:01 -07:00
Jeffrey Morgan afd8faf54a Merge branch 'master' of github.com:docker/toolbox 2015-08-12 20:42:00 -07:00
Jeffrey Morgan e8c3a5eba9 Bump Kitematic to 0.8.2 on windows 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 20:41:57 -07:00
Jeffrey Morgan 5cd30d7e62 Bump kitematic to 0.8.2 on osx 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 20:40:59 -07:00
Jeffrey Morgan c6aaba6525 Merge branch 'master' of github.com:docker/toolbox 2015-08-12 20:32:48 -07:00
Jeffrey Morgan 712a864be6 Bump to 1.8.1 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 20:21:37 -07:00
Jeffrey Morgan 825b387c39 Bump to 1.8.1 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 20:20:51 -07:00
Jeffrey Morgan e0a5b14954 Merge branch 'master' of github.com:docker/toolbox 2015-08-12 19:41:54 -07:00
Jeffrey Morgan 4201ffc84b Check for migration ability 2015-08-12 19:41:38 -07:00
Jeffrey Morgan 80b9ebee15 Check if DockerMachine was selected before continuing 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 16:04:13 -07:00
Jeffrey Morgan 13a8ca268a Merge branch 'master' of github.com:docker/toolbox 
Conflicts:
	windows/start.sh
 2015-08-12 15:09:35 -07:00
Jeffrey Morgan 05ca1fc9a7 Only offer to migrate if requirements are met 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 15:09:12 -07:00
Jeffrey Morgan a3064d24cc Bump Kitematic to 0.8.1 on windows 2015-08-12 15:08:47 -07:00
Jeffrey Morgan a83c1222be Removed the need for sed in the startup script on windows, and made it more defensible 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 15:08:34 -07:00
Jeffrey Morgan 4f90253210 Bump to 1.8.0b 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 15:06:49 -07:00
Jeffrey Morgan 2c3299a986 Check for Virtualbox.app 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-12 14:56:02 -07:00
Jeffrey Morgan 895c92cce7 Removing the need for sed in quickstart 2015-08-12 13:52:39 -07:00
Jeffrey Morgan 34cf237f2f Make Quickstart shell more defensible 2015-08-12 13:52:25 -07:00
Jeffrey Morgan cc4b0142d3 Make windows start script more defensible 2015-08-12 10:49:08 -07:00
Jeffrey Morgan aee81588dd Make quickstart script and migration script more defensible 2015-08-12 10:44:42 -07:00
Jeffrey Morgan 5b1b8e69ed Merge branch 'master' of github.com:docker/toolbox 2015-08-11 18:28:58 -07:00
Jeffrey Morgan 155e504d22 Merge branch 'master' of github.com:docker/toolbox 2015-08-11 18:26:32 -07:00
Jeffrey Morgan 4186225f30 Bump for 1.8.0 2015-08-11 18:26:25 -07:00
Jeffrey Morgan fe44036efd Bump Dockerfile versions 2015-08-11 18:22:30 -07:00
Michael Chiang 63eed22586 update 2015-08-11 14:14:05 -07:00
Jeffrey Morgan fbf42d8d33 Bump toolbox 2015-08-11 12:33:16 -07:00
Jeffrey Morgan a7e7a070ba Fix minor errors on windows 2015-08-11 08:58:49 -07:00
Jeffrey Morgan 74a1fde802 Minor osx shell fixes 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-11 08:14:32 -07:00
Jeffrey Morgan d54a3ccde0 Merge branch 'master' of github.com:docker/toolbox 2015-08-10 23:25:16 -07:00
Jeffrey Morgan 83ed662cb2 Minor Windows fixes 2015-08-10 23:25:08 -07:00
Jeffrey Morgan 6594b2d240 Merge branch 'master' of github.com:docker/toolbox 2015-08-10 21:39:47 -07:00
Jeffrey Morgan 0164cd8ce9 Catch errors in migration script 2015-08-10 21:39:40 -07:00
Jeffrey Morgan 3c7856a243 Merge branch 'master' of github.com:docker/toolbox 2015-08-10 20:16:56 -07:00
Jeffrey Morgan 3c85548061 Fix small toolbox bugs 2015-08-10 20:16:26 -07:00
Michael Chiang 26d3c76e65 update 2015-08-10 19:43:03 -07:00
Michael Chiang d6fdd12a20 update 2015-08-10 19:42:22 -07:00
Michael Chiang 720737be05 update testing to include KM. 2015-08-10 18:58:07 -07:00
Jeffrey Morgan 77ad0f4535 Update TESTING.md 2015-08-10 15:54:27 -07:00
Jeffrey Morgan 9f3c9cbcb7 Bump to rc7 2015-08-10 15:43:04 -07:00
Jeffrey Morgan 30d292b6de Update TESTING.md 2015-08-10 14:45:56 -07:00
Jeffrey Morgan 4493b497f6 Merge branch 'master' of github.com:docker/toolbox 2015-08-10 14:43:39 -07:00
Jeffrey Morgan 84aa629ef4 Changed brown border to blue 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-08-10 14:43:32 -07:00
Michael Chiang d7b8a26679 update testing. 2015-08-10 14:29:31 -07:00
Michael Chiang e8c8f6560f Adding contributing license. 2015-08-10 14:19:18 -07:00
Jeffrey Morgan ac79acb3b7 Create CONTRIBUTING.md 2015-08-10 14:17:27 -07:00
Jeffrey Morgan 87f4b7289c Create TESTING.md 2015-08-10 14:11:41 -07:00
Jeffrey Morgan 8259f2740d Adding graceful exit to quickstart terminal script 2015-08-10 14:06:06 -07:00
Jeffrey Morgan ead46cbd3b Merge branch 'master' of github.com:docker/toolbox 2015-08-10 13:35:38 -07:00
Jeffrey Morgan 8969ff80c6 Fixing migration on windows 7, adding Kitematic as files instead of a separate installer 2015-08-10 13:28:52 -07:00