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

Merge branch 'master' of github.com:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-08-12 20:32:48 -07:00
parent 825b387c39 712a864be6
commit c6aaba6525
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
windows/Toolbox.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Docker Toolbox" #define MyAppName "Docker Toolbox"
#define MyAppVersion "1.8.0b" #define MyAppVersion "1.8.1"
#define MyAppPublisher "Docker" #define MyAppPublisher "Docker"
#define MyAppURL "https://docker.com" #define MyAppURL "https://docker.com"
#define MyAppContact "https://docs.docker.com" #define MyAppContact "https://docs.docker.com"
@ -308,6 +308,7 @@ begin
if not IsComponentSelected('DockerMachine') or not FileExists('C:\Program Files\Oracle\VirtualBox\VBoxManage.exe') or not FileExists(ExpandConstant('{app}\docker-machine.exe')) then if not IsComponentSelected('DockerMachine') or not FileExists('C:\Program Files\Oracle\VirtualBox\VBoxManage.exe') or not FileExists(ExpandConstant('{app}\docker-machine.exe')) then
begin begin
Result := true Result := true
exit exit
end; end;

4
windows/bundle.sh
View File

@ -4,13 +4,13 @@ set -e
# Script to grab binaries that are going to be bundled with windows installer. # Script to grab binaries that are going to be bundled with windows installer.
# Note to maintainers: Update versions used below with newer releases # Note to maintainers: Update versions used below with newer releases
docker=1.8.0 docker=1.8.1
dockerMachine=0.4.0 dockerMachine=0.4.0
kitematic=0.8.1 kitematic=0.8.1
vbox=5.0.0 vbox=5.0.0
vboxRev=101573 vboxRev=101573
msysGit=1.9.5-preview20150319 msysGit=1.9.5-preview20150319
installer=1.8.0 installer=1.8.1
mixpanel=c306ae65c33d7d09fe3e546f36493a6e mixpanel=c306ae65c33d7d09fe3e546f36493a6e
boot2dockerIsoSrc=boot2docker boot2dockerIsoSrc=boot2docker