diff --git a/README.md b/README.md index 10db9b2655..bb1239ca9f 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # Docker Toolbox + +![illustration-website copy](https://cloud.githubusercontent.com/assets/251292/8635484/dea7d166-27d8-11e5-93f9-76d20b2fa80e.png) diff --git a/ROADMAP.md b/ROADMAP.md index 0dcb6a466b..2ca4e92696 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1 +1,9 @@ # Docker Toolbox Roadmap + + +## Documentation Work + +* [ ] [Rewrite Mac Installation](https://github.com/docker/docker/issues/14561) 2-3 hours +* [ ] [Rewrite Windows Installation](https://github.com/docker/docker/issues/14560) 2-3 hours +* [ ] [Update Getting started on Mac](https://github.com/docker/tutorials/issues/8) 2-3 hours +* [ ] [Update throughout documentation for removal of boot2docker](https://github.com/docker/docker/issues/14563) 2-3 hours diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss index 925d0adbae..3219aac8a7 100644 --- a/windows/Toolbox.iss +++ b/windows/Toolbox.iss @@ -42,21 +42,23 @@ DefaultGroupName=Docker Inc ;InfoBeforeFile=.\LICENSE ;DisableFinishedPage ;InfoAfterFile= -OutputBaseFilename=docker-toolbox +OutputBaseFilename=DockerToolbox Compression=lzma SolidCompression=yes -WizardImageFile=logo-docker-side.bmp -WizardSmallImageFile=logo-docker-small.bmp +WizardImageFile=windows-installer-side.bmp +WizardSmallImageFile=windows-installer-logo.bmp WizardImageStretch=no WizardImageBackColor=$325461 ; in the installer itself: -SetupIconFile=toolbox.ico + ; in the "Add/Remove" list: UninstallDisplayIcon={app}\toolbox.ico SignTool=ksign /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f +SetupIconFile=toolbox.ico + ; for modpath.iss ChangesEnvironment=true @@ -75,25 +77,27 @@ Name: rebootwindows; Description: "&Reboot Windows at the end of installation"; [Components] Name: "Docker"; Description: "Docker Client for Windows" ; Types: full upgrade +Name: "DockerMachine"; Description: "Docker Machine for Windows" ; Types: full upgrade Name: "Kitematic"; Description: "Kitematic for Windows" ; Types: full upgrade -Name: "Boot2Docker"; Description: "Boot2Docker ISO" ; Types: full upgrade Name: "VirtualBox"; Description: "VirtualBox"; Types: full Name: "MSYS"; Description: "MSYS-git UNIX tools"; Types: full [Files] -Source: ".\toolbox.ico"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\docker-cli.ico"; DestDir: "{app}"; Flags: ignoreversion ; Docker Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" -Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" Source: ".\start.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" Source: ".\delete.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker" +; DockerMachine +Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine" + ; Kitematic Source: "{#kitematicSetup}"; DestDir: "{app}\installers\kitematic"; Flags: ignoreversion; AfterInstall: RunInstallKitematic(); Components: "Kitematic" ; Boot2Docker -Source: "{#b2dIso}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Boot2Docker" +Source: "{#b2dIso}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine" ; msys-Git Source: "{#msysGit}"; DestDir: "{app}\installers\msys-git"; DestName: "msys-git.exe"; AfterInstall: RunInstallMSYS(); Components: "MSYS" @@ -106,10 +110,10 @@ Source: "{#virtualBoxMsi}"; DestDir: "{app}\installers\virtualbox"; DestName: "v [Icons] Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico" -Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Tasks: desktopicon -Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico" -Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh" +Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker" +Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Tasks: desktopicon; Components: "Docker" +Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/docker-cli.ico"; Components: "Docker" +Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"; Components: "DockerMachine" [UninstallRun] Filename: "{app}\delete.sh" @@ -209,15 +213,15 @@ begin //WizardForm.NextButton.Caption := SetupMessage(msgButtonNext); //if CurPageID = wpFinished then //WizardForm.NextButton.Caption := SetupMessage(msgButtonFinish) - if CurPageID = wpSelectComponents then - begin - if IsUpgrade() then - begin - Wizardform.TypesCombo.ItemIndex := 2 - end; - Wizardform.ComponentsList.Checked[2] := NeedToInstallVirtualBox(); - Wizardform.ComponentsList.Checked[3] := NeedToInstallMSYS(); - end; + // if CurPageID = wpSelectComponents then + // begin + // if IsUpgrade() then + // begin + // Wizardform.TypesCombo.ItemIndex := 2 + // end; + // Wizardform.ComponentsList.Checked[3] := NeedToInstallVirtualBox(); + // Wizardform.ComponentsList.Checked[4] := NeedToInstallMSYS(); + // end; end; procedure RunInstallVirtualBox(); diff --git a/windows/docker-cli.ico b/windows/docker-cli.ico new file mode 100644 index 0000000000..5c3992dd9c Binary files /dev/null and b/windows/docker-cli.ico differ diff --git a/windows/logo-docker-side.bmp b/windows/logo-docker-side.bmp deleted file mode 100644 index d7f34d07bc..0000000000 Binary files a/windows/logo-docker-side.bmp and /dev/null differ diff --git a/windows/logo-docker-side.xcf b/windows/logo-docker-side.xcf deleted file mode 100644 index 15bdb48f54..0000000000 Binary files a/windows/logo-docker-side.xcf and /dev/null differ diff --git a/windows/logo-docker-small.bmp b/windows/logo-docker-small.bmp deleted file mode 100644 index d29961065b..0000000000 Binary files a/windows/logo-docker-small.bmp and /dev/null differ diff --git a/windows/logo-docker-small.xcf b/windows/logo-docker-small.xcf deleted file mode 100644 index 8f46669fd3..0000000000 Binary files a/windows/logo-docker-small.xcf and /dev/null differ diff --git a/windows/start.sh b/windows/start.sh index bebcb0746d..724134a97a 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -1,37 +1,47 @@ #!/bin/bash -set -e +ISO=$HOME/.docker/machine/cache/boot2docker.iso +VM=dev +DOCKER_MACHINE=./docker-machine.exe -# clear the MSYS MOTD -clear - -cd "$(dirname "$BASH_SOURCE")" - -ISO="$HOME/.boot2docker/boot2docker.iso" - -if [ ! -e "$ISO" ]; then - echo 'copying initial boot2docker.iso (run "boot2docker.exe download" to update)' +mkdir -p ~/.docker/machine/cache +if [ ! -f $ISO ]; then mkdir -p "$(dirname "$ISO")" cp ./boot2docker.iso "$ISO" fi -echo 'initializing...' -./boot2docker.exe init -echo +machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") +if [ -z $machine ]; then + echo "Creating Machine $VM..." + $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM +else + echo "Machine $VM already exists." +fi -echo 'starting...' -./boot2docker.exe start -echo +echo "Starting machine $VM..." +$DOCKER_MACHINE start dev -echo 'IP address of docker VM:' -./boot2docker.exe ip -echo +echo "Setting environment variables for machine $VM..." +./docker-machine.exe env $VM | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path -echo 'setting environment variables ...' -./boot2docker.exe shellinit | sed 's,\\,\\\\,g' # eval swallows single backslashes in windows style path -eval "$(./boot2docker.exe shellinit 2>/dev/null | sed 's,\\,\\\\,g')" -echo - -echo 'You can now use `docker` directly, or `boot2docker ssh` to log into the VM.' +eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')" cd +clear + +cat << EOF + ## . + ## ## ## == + ## ## ## ## ## === + /"""""""""""""""""\___/ === + ~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ / ===- ~~~ + \______ o __/ + \ \ __/ + \____\_______/ + +EOF +echo +echo "Your shell is configured to use docker with the VM: $VM" +echo "You can ssh into the VM via 'docker-machine ssh $VM'" +echo + exec "$BASH" --login -i diff --git a/windows/toolbox.ico b/windows/toolbox.ico index 424afcc049..933f0ca189 100644 Binary files a/windows/toolbox.ico and b/windows/toolbox.ico differ diff --git a/windows/windows-installer-logo.bmp b/windows/windows-installer-logo.bmp new file mode 100644 index 0000000000..8a1972eb98 Binary files /dev/null and b/windows/windows-installer-logo.bmp differ diff --git a/windows/windows-installer-side.bmp b/windows/windows-installer-side.bmp new file mode 100644 index 0000000000..2a8b3afd5a Binary files /dev/null and b/windows/windows-installer-side.bmp differ