This repository has been archived by the owner. It is now read-only.

Update build.sh to pull bundle dependencies #82

Merged
merged 2 commits into from Mar 24, 2015

Conversation

Projects
None yet
3 participants
@ahmetb
Contributor

ahmetb commented Mar 23, 2015

Updated build.sh script to reduce manual work for wget'ing required binaries in the bundle.

Also bumped the VirtualBox version.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com

@SvenDowideit

This comment has been minimized.

Contributor

SvenDowideit commented Mar 23, 2015

LGTM - @tianon

build.sh Outdated
cd ../Boot2Docker
curl -s -L -o virtualbox.exe http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26-98988-Win.exe
virtualbox.exe -extract -silent -path . && rm virtualbox.exe # not neeeded after extraction

This comment has been minimized.

@ahmetb

ahmetb Mar 23, 2015

Contributor

@SvenDowideit @tianon this guy extracts vbox msi installer for amd64 & x86. do you guys remove x86 one while bundling coz that's extra 24 MB? if so we can add another rm here.

build.sh Outdated
curl -s -L -o boot2docker.exe https://github.com/boot2docker/boot2docker-cli/releases/download/v0.9.2/boot2docker-v0.9.2-windows-amd64.exe
)
(
mkdir -p "msysGit" && cd "mSysGit"

This comment has been minimized.

@tianon

tianon Mar 24, 2015

Contributor

I know the actual FS is case insensitive, but can we at least be self-consistent and have both of these be msysGit? 👍

This comment has been minimized.

@ahmetb

ahmetb Mar 24, 2015

Contributor

oh my bad

@@ -17,7 +17,7 @@
; https://www.virtualbox.org/wiki/Downloads
; Then, run "VirtualBox-x.x.x-xxx-Win.exe --extract --path ."
#define virtualBoxCommon ".\VirtualBox\common.cab"
#define virtualBoxMsi ".\VirtualBox\VirtualBox-4.3.20-r96997-MultiArch_amd64.msi"
#define virtualBoxMsi ".\VirtualBox\VirtualBox-4.3.26-r98988-MultiArch_amd64.msi"

This comment has been minimized.

@tianon

tianon Mar 24, 2015

Contributor

Do you think it'd be worth renaming this file in build.sh so that we can keep all our version numbers in one central place? (and thus simplify version bumps)

This comment has been minimized.

@ahmetb

ahmetb Mar 24, 2015

Contributor

@tianon umm actually on build.sh side some exe extracts msi file with version in it. but we can do mv *_amd64.msi virtualbox_amd64.msi and just use virtualbox_amd64.msi` here. How does that sound to you?

This comment has been minimized.

@tianon

tianon Mar 24, 2015

Contributor

Yeah, that's exactly what I meant. 👍

README.md Outdated
@@ -5,7 +5,7 @@ Installation [instructions](https://docs.docker.com/installation/windows/) avail
## What is included:
- [msys-git 1.9.4](http://msysgit.github.io/) for tools like `OpenSSH` and `BASH`
- [VirtualBox 4.3.18](https://www.virtualbox.org)
- [VirtualBox 4.3.26](https://www.virtualbox.org)
- [Boot2Docker-cli management tool 1.3.0](https://github.com/boot2docker/boot2docker-cli)
- [Boot2Docker ISO 1.3.0](https://github.com/boot2docker/boot2docker)

This comment has been minimized.

@tianon

tianon Mar 24, 2015

Contributor

One line below this, we have (The ISO contains Docker 1.3.0 - unfortunately we don't have a native Windows Docker client yet.). I'd prefer we remove version numbers completely from this list, though, and just have it list what software is included. We enumerate the version numbers for each release in the release notes themselves.

This comment has been minimized.

@ahmetb

ahmetb Mar 24, 2015

Contributor

Sure thing.

ahmetb added some commits Mar 23, 2015

Update build.sh to pull bundle dependencies
Also bump VirtualBox version.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Removed version numbers, download to bundle/
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@tianon

This comment has been minimized.

Contributor

tianon commented Mar 24, 2015

LGTM ❤️

tianon added a commit that referenced this pull request Mar 24, 2015

Merge pull request #82 from ahmetalpbalkan/build.sh
Update build.sh to pull bundle dependencies

@tianon tianon merged commit 5f05dc9 into boot2docker:master Mar 24, 2015

@ahmetb ahmetb deleted the ahmetb:build.sh branch Mar 24, 2015

@ahmetb ahmetb referenced this pull request Mar 24, 2015

Closed

Proposal: Shipping Docker CLI for Windows #80

7 of 9 tasks complete
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.