Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:docker/toolbox
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorganca committed Aug 12, 2015
2 parents fe44036 + 155e504 commit 5b1b8e6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ Things to try:

### Mac OS X 10.11

- [ ] Install + Quick Start
- [ ] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic
- [x] Install + Quick Start
- [x] Install + Migrating Boot2Docker
- [x] Install + Start Kitematic

### Mac OS X 10.10

- [ ] Install + Quick Start
- [ ] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic
- [x] Install + Quick Start
- [x] Install + Migrating Boot2Docker
- [x] Install + Start Kitematic

### Mac OS X 10.9

- [ ] Install + Quick Start
- [ ] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic
- [x] Install + Quick Start
- [x] Install + Migrating Boot2Docker
- [x] Install + Start Kitematic

### Windows 10

Expand Down
2 changes: 1 addition & 1 deletion windows/Toolbox.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Docker Toolbox"
#define MyAppVersion "1.8.0-rc8"
#define MyAppVersion "1.8.0"
#define MyAppPublisher "Docker"
#define MyAppURL "https://docker.com"
#define MyAppContact "https://docs.docker.com"
Expand Down
12 changes: 6 additions & 6 deletions windows/bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ set -e
# Script to grab binaries that are going to be bundled with windows installer.
# Note to maintainers: Update versions used below with newer releases

docker=1.8.0-rc3
dockerMachine=0.4.0-rc2
kitematic=0.8.0-rc5
docker=1.8.0
dockerMachine=0.4.0
kitematic=0.8.0
vbox=5.0.0
vboxRev=101573
msysGit=1.9.5-preview20150319
installer=1.8.0-rc8
installer=1.8.0
mixpanel=c306ae65c33d7d09fe3e546f36493a6e

boot2dockerIsoSrc=tianon
dockerBucket=test.docker.com
boot2dockerIsoSrc=boot2docker
dockerBucket=get.docker.com

set -x
rm -rf bundle
Expand Down

0 comments on commit 5b1b8e6

Please sign in to comment.