diff --git a/README.md b/README.md index 9697cd3e6f..8cb7dd6279 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Docker Toolbox ![logo](https://cloud.githubusercontent.com/assets/251292/8971250 The Docker Toolbox installs everything you need to get started with Docker on Mac OS X and Windows, including: -| | Mac | Windows | Linux on Desktop (Help Wanted) | +| | Mac | Windows | Desktop Linux (Help Wanted) | |------------------------|--------|-------------|--------------------------------| | Docker Client / Engine | Client | Client | Engine | | Docker Machine | Yes | Yes | Yes | diff --git a/VERSION b/VERSION index bd8bf882d0..1298ad0a15 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.0 +1.8.0-rc3 diff --git a/osx/README.md b/osx/README.md index caac60e0a8..3a9550dfbf 100644 --- a/osx/README.md +++ b/osx/README.md @@ -5,8 +5,3 @@ Installation [instructions](https://docs.docker.com/mac/started/) available on t ##How to build Running `make` will produce a `Docker.pkg` installer. - -##License -Docker Toolbox code is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/docker/toolbox/blob/master/LICENSE) for the full license text. - -Docker Toolbox Logo and all other related Docker artwork © Docker, Inc. 2015. All rights reserved; not licensed for third party use. diff --git a/windows/MAINTENANCE.md b/windows/MAINTENANCE.md deleted file mode 100644 index ae143fbcba..0000000000 --- a/windows/MAINTENANCE.md +++ /dev/null @@ -1,47 +0,0 @@ -# Preparing development environment (for maintainers) - -1. Install Inno Setup 5 non-unicode: http://www.jrsoftware.org/isdl.php (`isetup-5.x.x-unicode.exe`). - -2. Install `kSignCMD`: http://codesigning.ksoftware.net/ (click "Download kSign" -and then "FREE DOWNLOAD" or "Click Here to Download kSign", which will likely be -a link to http://cdn1.ksoftware.net/ksign_installer.exe) - -3. Install the `docker-code-signing.pfx` certificate somewhere (the instructions -below assume `Z:\sven\src\docker\windows-installer\docker-code-signing.pfx`); -you will need the password (`d_get_from_core` below). - -4. Open `Toolbox.iss` in the Inno Setup Compiler. It has a few constants at -the top that are important to make note of (especially `MyAppVersion` and the -path variables `dockerCli`, `dockerMachineCli`, `kitematicSetup`, `b2dIso`, `msysGit`, `virtualBoxMsi`, and `virtualBoxCommon`). - -5. Launch **Inno Setup Compiler** by opening `Toolbox.iss` and add code signing -by applying the following steps: - -- Click "Tools" --> "Configure Sign Tools" > "Add" -- "Name of the Sign Tool:" `ksign` -- "Command of the Sign Tool:" `"C:\Program Files (x86)\kSign\kSignCMD.exe" /f Z:\sven\src\docker\windows-installer\docker-code-signing.pfx /p d_get_from_core $p` - -# Releasing a new version - -Update the versions of the dependencies in `bundle.sh`. - -Update `#define MyAppVersion` line in `Toolbox.iss`. - -# Downloading bundle dependencies - -Open a git bash window in this directory and run script: - - ./bundle.sh - -This should be downloading dependencies with their correct versions to `bundle\` -folder where the Inno Setup Compiler can pick up from. - -# Compiling the installer - -After configuring, open `Toolbox.iss` with Inno Setup Compiler and hit -**'Build'**. The results will be in the `Output` folder. - -This can be done through commandline as welll. Launch a cmd.exe shell from this -directory and run: - - "c:\Program Files (x86)\Inno Setup 5\ISCC.exe" Toolbox.iss diff --git a/windows/README.md b/windows/README.md index fb883632ee..cf5ff40c5a 100644 --- a/windows/README.md +++ b/windows/README.md @@ -1,20 +1,47 @@ -# Docker Toolbox for Windows +# Building the Windows Toolbox -Installation [instructions](http://docs.docker.com/windows/started/) available on the Docker documentation site. +1. Install Inno Setup 5 non-unicode: http://www.jrsoftware.org/isdl.php (`isetup-5.x.x-unicode.exe`). -## Why Inno Setup? +2. Install `kSignCMD`: http://codesigning.ksoftware.net/ (click "Download kSign" +and then "FREE DOWNLOAD" or "Click Here to Download kSign", which will likely be +a link to http://cdn1.ksoftware.net/ksign_installer.exe) -I've chosen to make a simple installer using [Inno Setup](http://www.jrsoftware.org/) -because that is what the [msysGit](http://git-scm.com/) installer is built with. +3. Install the `docker-code-signing.pfx` certificate somewhere (the instructions +below assume `Z:\sven\src\docker\windows-installer\docker-code-signing.pfx`); +you will need the password (`d_get_from_core` below). -(It also happens that I've used Inno Setup before, so I can make something faster.) +4. Open `Toolbox.iss` in the Inno Setup Compiler. It has a few constants at +the top that are important to make note of (especially `MyAppVersion` and the +path variables `dockerCli`, `dockerMachineCli`, `kitematicSetup`, `b2dIso`, `msysGit`, `virtualBoxMsi`, and `virtualBoxCommon`). -## Maintenance +5. Launch **Inno Setup Compiler** by opening `Toolbox.iss` and add code signing +by applying the following steps: -See `MAINTENANCE.md` for instructions on how to update, bundle and compile the -Docker Toolbox Windows Installer. +- Click "Tools" --> "Configure Sign Tools" > "Add" +- "Name of the Sign Tool:" `ksign` +- "Command of the Sign Tool:" `"C:\Program Files (x86)\kSign\kSignCMD.exe" /f Z:\sven\src\docker\toolbox\docker-code-signing.pfx /p d_get_from_core $p` -## License -Docker Toolbox code is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/docker/toolbox/blob/master/LICENSE) for the full license text. +# Releasing a new version -Docker Toolbox Logo and all other related Docker artwork © Docker, Inc. 2015. All rights reserved; not licensed for third party use. +Update the versions of the dependencies in `bundle.sh`. + +Update `#define MyAppVersion` line in `Toolbox.iss`. + +# Downloading bundle dependencies + +Open a git bash window in this directory and run script: + + ./bundle.sh + +This should be downloading dependencies with their correct versions to `bundle\` +folder where the Inno Setup Compiler can pick up from. + +# Compiling the installer + +After configuring, open `Toolbox.iss` with Inno Setup Compiler and hit +**'Build'**. The results will be in the `Output` folder. + +This can be done through commandline as welll. Launch a cmd.exe shell from this +directory and run: + + "c:\Program Files (x86)\Inno Setup 5\ISCC.exe" Toolbox.iss