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

Fix minor errors on windows

This commit is contained in:
Jeffrey Morgan 2015-08-11 08:58:49 -07:00
parent 74a1fde802
commit a7e7a070ba
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
windows/Toolbox.iss
View File

@ -323,6 +323,7 @@ begin
begin begin
WizardForm.StatusLabel.Caption := 'Migrating Boot2Docker VM...' WizardForm.StatusLabel.Caption := 'Migrating Boot2Docker VM...'
WizardForm.FilenameLabel.Caption := 'This will take a minute...' WizardForm.FilenameLabel.Caption := 'This will take a minute...'
ExecAsOriginalUser(ExpandConstant('{app}\docker-machine.exe'), ExpandConstant('rm -f default > nul 2>&1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
DelTree(ExpandConstant('{userdocs}\..\.docker\machine\machines\default'), True, True, True); DelTree(ExpandConstant('{userdocs}\..\.docker\machine\machines\default'), True, True, True);
ExecAsOriginalUser(ExpandConstant('{app}\migrate.bat'), ExpandConstant('> {localappdata}\Temp\toolbox-migration-logs.txt 2>&1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode) ExecAsOriginalUser(ExpandConstant('{app}\migrate.bat'), ExpandConstant('> {localappdata}\Temp\toolbox-migration-logs.txt 2>&1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
if ResultCode = 0 then if ResultCode = 0 then

1
windows/start.sh
View File

@ -16,6 +16,7 @@ set -e
if [ $VM_EXISTS_CODE -ne 0 ]; then if [ $VM_EXISTS_CODE -ne 0 ]; then
echo "Creating Machine $VM..." echo "Creating Machine $VM..."
$DOCKER_MACHINE rm -f $VM &> /dev/null || :
rm -rf ~/.docker/machine/machines/$VM rm -rf ~/.docker/machine/machines/$VM
$DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
else else