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-11 18:28:58 -07:00
parent fe44036efd 155e504d22
commit 5b1b8e69ed
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TESTING.md
View File

@ -10,21 +10,21 @@ Things to try:
### Mac OS X 10.11 ### Mac OS X 10.11
- [ ] Install + Quick Start - [x] Install + Quick Start
- [ ] Install + Migrating Boot2Docker - [x] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic - [x] Install + Start Kitematic
### Mac OS X 10.10 ### Mac OS X 10.10
- [ ] Install + Quick Start - [x] Install + Quick Start
- [ ] Install + Migrating Boot2Docker - [x] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic - [x] Install + Start Kitematic
### Mac OS X 10.9 ### Mac OS X 10.9
- [ ] Install + Quick Start - [x] Install + Quick Start
- [ ] Install + Migrating Boot2Docker - [x] Install + Migrating Boot2Docker
- [ ] Install + Start Kitematic - [x] Install + Start Kitematic
### Windows 10 ### Windows 10

2
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.0-rc8" #define MyAppVersion "1.8.0"
#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"

12
windows/bundle.sh
View File

@ -4,17 +4,17 @@ 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-rc3 docker=1.8.0
dockerMachine=0.4.0-rc2 dockerMachine=0.4.0
kitematic=0.8.0-rc5 kitematic=0.8.0
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-rc8 installer=1.8.0
mixpanel=c306ae65c33d7d09fe3e546f36493a6e mixpanel=c306ae65c33d7d09fe3e546f36493a6e
boot2dockerIsoSrc=tianon boot2dockerIsoSrc=boot2docker
dockerBucket=test.docker.com dockerBucket=get.docker.com
set -x set -x
rm -rf bundle rm -rf bundle