docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
343 Commits 92 Branches 28 Tags
1f04b1ea02da67eddd3789bf4acc06ce46f14433
Commit Graph

343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeffrey Morgan
1f04b1ea02 Merge branch 'master' of github.com:docker/toolbox 2015-10-29 18:48:48 -07:00
Jeffrey Morgan
2d3a95a0e8 Bump versions for rc3 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-29 18:48:44 -07:00
Jeffrey Morgan
60db63d38c Update circle.yml 2015-10-29 16:22:23 -07:00
Jeffrey Morgan
583af26789 On upgrade, stop machine in debug mode 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-28 13:24:09 -07:00
Jeffrey Morgan
18a773aa5a Bump Kitematic to 0.9.2 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-23 17:25:30 -07:00
Jeffrey Morgan
9ff311e410 Fixed bug where windows upgrade would fail if VM was stopped 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-23 16:49:46 -07:00
Jeffrey Morgan
7cca8f18bb Bump to 1.9.0-rc2 2015-10-23 14:09:58 -07:00
Jeffrey Morgan
08d1f6c8ac Merge branch 'master' of github.com:docker/toolbox 2015-10-22 21:04:56 -07:00
Jeffrey Morgan
17c9b80f16 Bump versions of machine and kitematic 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-22 21:04:51 -07:00
Michael Chiang
dfb77906b7 Merge pull request #203 from tiangolo/disk-size 
Start default machine with dynamic disk size of max 200GB instead of 20 GB. (Note: Disk dynamically expands)
 2015-10-22 13:26:07 -07:00
Sebastián Ramírez
9d572c71af Set default of default Docker machine to 200GB 
Signed-off-by: Sebastián Ramírez <tiangolo@gmail.com>
 2015-10-22 14:43:01 -05:00
Sebastián Ramírez
6f832d3ca1 Set default size of the default docker machine to 250GB 
Signed-off-by: Sebastián Ramírez <tiangolo@gmail.com>
 2015-10-22 13:33:09 -05:00
Jeffrey Morgan
6d932bfa03 Set global environment variable for kitematic and other tools 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-21 20:30:02 -07:00
Jeffrey Morgan
1b1d1e365c Fix issue where upgrade would not work with rc versions 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-21 20:29:43 -07:00
Jeffrey Morgan
87e55241c4 Compression lzma 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-21 14:42:05 -07:00
Jeffrey Morgan
ddaa10debf Merge branch 'upgrade' 2015-10-21 14:41:12 -07:00
Jeffrey Morgan
cf2e5d054b Bump virtualbox, include machine binaries 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-21 14:40:53 -07:00
Jeffrey Morgan
3a8238e75c Merge pull request #251 from docker/update-message 
Update installer message to specify anonymous information is being collected.
 2015-10-21 14:38:11 -07:00
Michael Chiang
23a0a9555f windows install message update. 
windows message update.
 2015-10-21 14:34:53 -07:00
Michael Chiang
3f7b826e9c update. 2015-10-21 14:27:34 -07:00
Michael Chiang
5fd552a8f6 Update installer message to specify anonymous information is being collected. 
Update installer message to specify anonymous information is being
collected.
 2015-10-21 14:26:05 -07:00
Jeffrey Morgan
ce01262e16 1.9 and upgrades on Mac OS X 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-20 11:06:53 -07:00
Jeffrey Morgan
3c0dfd1858 OSX Bump for 1.9 & changes for docker-machine 0.5.0 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-18 16:54:41 -07:00
Jeffrey Morgan
5fa41089d1 Merge branch 'master' into upgrade 2015-10-14 21:06:23 -07:00
Jeffrey Morgan
c6655ab033 Bump Docker to 1.8.3 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-12 11:50:09 -07:00
Jeffrey Morgan
cac6d99564 Temporary, improved conclusion text - tell user how to upgrade their VM. 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 19:43:32 -07:00
Jeffrey Morgan
72ebba3410 WIP windows upgrade 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 19:02:13 -07:00
Jeffrey Morgan
da62a9a3e7 Mac OS X Upgrade 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 18:20:48 -07:00
Jeffrey Morgan
ba639b26cf Merge branch 'master' into upgrade 2015-10-11 18:02:42 -07:00
Jeffrey Morgan
f2dc1a7098 Merge branch 'master' of github.com:docker/toolbox 2015-10-11 17:37:40 -07:00
Jeffrey Morgan
b1e77fb8ff Fix detection of VBoxManage.exe location 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 17:37:38 -07:00
Jeffrey Morgan
06f3901af8 Merge pull request #237 from jeffdm/master 
Add note to help users fix tty errors with winpty
 2015-10-11 16:20:22 -07:00
Jeffrey Morgan
48db88bde3 Updated start.sh messaging for winpty & interactive support 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 15:59:09 -07:00
Jeffrey Morgan
8e0fbecb05 Fix bug where other installations of bash would not trigger --login flag in Quickstart Terminal 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-11 15:29:22 -07:00
Jeffrey Morgan
30d33dea9c Keep only mixpanel 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-09 16:36:13 -04:00
Jeffrey Morgan
d6875fa921 Remove unused line in Makefile 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-07 22:40:42 -04:00
Jeffrey Morgan
f250c71979 Merge pull request #221 from jeffdm/master 
Fix tty errors using winpty
 2015-10-07 13:13:39 -04:00
Jeffrey Morgan
843944137b Fix tty errors using winpty 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-06 20:51:45 -04:00
Jeffrey Morgan
6651c01406 Remove sign directives 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-06 15:02:32 -04:00
Jeffrey Morgan
16571b9f68 Bump versions 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-10-06 11:57:23 -04:00
Jeffrey Morgan
678e926cea Create circle.yml 2015-10-06 11:38:38 -04:00
Jeffrey Morgan
ae01cab51b Merge branch 'master' of github.com:docker/toolbox into upgrade 2015-10-05 12:02:18 -04:00
Jeffrey Morgan
9a2cdbb752 Merge pull request #218 from gmanfunky/vbox-bump 
Virtual box to v5.0.6
 2015-10-04 17:56:19 -04:00
Gabe Friedmann
28a454543b Virtual box to v5.0.6 
Signed-off-by: Gabe Friedmann <gabe.friedmann@riotgames.com>
 2015-10-04 14:44:25 -05:00
Jeffrey Morgan
7a879716b9 Merge pull request #211 from tjwudi/patch-1 
Only select one shell
 2015-10-04 15:00:26 -04:00
John Wu
4d01bd5902 Only select one shell 
`dscl /Search -read /Users/$USER UserShell | awk '{print $2}'` can output multiple user shells. For me, I have both `/bin/zsh` and `/bin/bash` on two separated line. Then the `USER_SHELL` should become `/bin/zsh /bin/bash`.

```bash
$echo $(dscl /Search -read /Users/$USER UserShell | awk '{print $2}')
> /bin/zsh /bin/bash
```

which can lead to fatal error when you are calling `$USER_SHELL`. Because you will be calling `/bin/zsh` with first parameter as `/bin/bash`.

See #210 for details.

Signed-off-by: tjwudi <webmaster@leapoahead.com>
 2015-09-30 21:53:57 -07:00
Jeffrey Morgan
51bd9804f3 Merge branch 'master' into upgrade 2015-09-28 15:17:17 +02:00
Jeffrey Morgan
f8c52017a0 Use docker-machine ssh instead of env on windows 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-09-28 11:13:10 +02:00
Jeffrey Morgan
7a35f84583 Bump versions for new version of compose 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-09-25 15:32:03 +02:00
Sebastián Ramírez
a60735853c Fix OSX disk creation as noticed by @SydOps 
The line to create the default Virtual Box machine in OSX was wrong.

Signed-off-by: Sebastián Ramírez <tiangolo@gmail.com>
 2015-09-24 20:17:50 -05:00