Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 49b2248

Browse files
lmakarovlmakarov
committed
Merge pull request #80 from blinkreaction/develop
Release v1.6.1
2 parents 193a7fc + eeade7b commit 49b2248

File tree

5 files changed

+96
-70
lines changed

5 files changed

+96
-70
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 1.6.1 (2016-06-03)
4+
5+
- Hotfix for downloading new docker binary versions
6+
- Added B2D_INSTALL_MODE switch
7+
- Updated docs
8+
9+
310
## 1.6.0 (2016-06-03)
411

512
- Switched to blinkreaction/boot2docker base box [v1.11.2](https://atlas.hashicorp.com/blinkreaction/boxes/boot2docker/versions/1.11.2)

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ For best result and a clean setup it is recommended to remove any previous versi
2020
Automatic **installation** and **updates** of prerequisites is available via the one-liners below.
2121
**Make sure to stop all VirtualBox VMs prior to performing updates.**
2222

23+
Note: If you already have brew/cask and necessary versions of VirtualBox and Vagrant installed,
24+
prefer to install them manually or would like to not update these components automatically,
25+
prefix the command with `B2D_INSTALL_MODE=docker `.
26+
2327
**Mac**
2428

2529
Prerequisites are installed using **brew/cask** (brew and cask will be installed if missing).

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.0
1+
1.6.1

‎scripts/presetup-mac.sh

+43-32
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,46 @@ echo-red () { echo -e "${red}$1${NC}"; }
1313
echo-green () { echo -e "${green}$1${NC}"; }
1414
echo-yellow () { echo -e "${yellow}$1${NC}"; }
1515

16-
# Homebrew installation
17-
echo-green "Installing Homebrew..."
18-
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
19-
20-
# Update brew formulae
21-
echo-green "Updating brew formulae..."
22-
brew update
23-
24-
# VirtualBox installation
25-
echo-green "Installing virtualbox..."
26-
brew cask install virtualbox
27-
# Kill the default adapter and DHCP server to avoid network issues down the road
28-
VBoxManage dhcpserver remove --netname HostInterfaceNetworking-vboxnet0 > /dev/null 2>&1
29-
VBoxManage hostonlyif remove vboxnet0 > /dev/null 2>&1
30-
31-
# Vagrant installation
32-
echo-green "Installing vagrant..."
33-
brew cask install vagrant
34-
35-
# Remove old docker version
36-
sudo rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
37-
# Install docker
38-
echo-green "Installing docker cli v${DOCKER_VERSION}..."
39-
sudo curl -sSL "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-$DOCKER_VERSION" -o /usr/local/bin/docker
40-
sudo chmod +x /usr/local/bin/docker
41-
42-
# Remove old docker-compose version
43-
sudo rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
44-
# Install docker-compose
45-
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
46-
sudo curl -sSL "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
47-
sudo chmod +x /usr/local/bin/docker-compose
16+
B2D_BRANCH="${B2D_BRANCH:-master}"
17+
B2D_INSTALL_MODE="${B2D_INSTALL_MODE:-full}"
18+
19+
# VirtualBox and Vagrant dependencies
20+
if [[ "$B2D_INSTALL_MODE" == "full" ]] || [[ "$B2D_INSTALL_MODE" == "vm" ]] ; then
21+
# Homebrew installation
22+
echo-green "Installing Homebrew..."
23+
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
24+
25+
# Update brew formulae
26+
echo-green "Updating brew formulae..."
27+
brew update
28+
29+
# VirtualBox installation
30+
echo-green "Installing virtualbox..."
31+
brew cask install virtualbox
32+
# Kill the default adapter and DHCP server to avoid network issues down the road
33+
VBoxManage dhcpserver remove --netname HostInterfaceNetworking-vboxnet0 > /dev/null 2>&1
34+
VBoxManage hostonlyif remove vboxnet0 > /dev/null 2>&1
35+
36+
# Vagrant installation
37+
echo-green "Installing vagrant..."
38+
brew cask install vagrant
39+
fi
40+
41+
# Docker and other dependencies
42+
if [[ "$B2D_INSTALL_MODE" == "full" ]] || [[ "$B2D_INSTALL_MODE" == "docker" ]] ; then
43+
# Remove old docker version
44+
sudo rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
45+
# Install docker
46+
echo-green "Installing docker cli v${DOCKER_VERSION}..."
47+
curl -sSL -O "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-$DOCKER_VERSION.tgz"
48+
tar zxf docker-$DOCKER_VERSION.tgz
49+
sudo mv docker/* /usr/local/bin
50+
rm -rf docker-$DOCKER_VERSION*
51+
52+
# Remove old docker-compose version
53+
sudo rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
54+
# Install docker-compose
55+
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
56+
sudo curl -sSL "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
57+
sudo chmod +x /usr/local/bin/docker-compose
58+
fi

‎scripts/presetup-win.sh

+41-37
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,46 @@ echo-red () { echo -e "${red}$1${NC}"; }
1414
echo-green () { echo -e "${green}$1${NC}"; }
1515
echo-yellow () { echo -e "${yellow}$1${NC}"; }
1616

17-
# For testing
18-
if [ ! $B2D_BRANCH == "" ]; then
19-
echo-red "[b2d-setup] testing mode: environment = ${B2D_BRANCH}"
20-
else
21-
B2D_BRANCH='master'
17+
B2D_BRANCH="${B2D_BRANCH:-master}"
18+
B2D_INSTALL_MODE="${B2D_INSTALL_MODE:-full}"
19+
20+
# VirtualBox and Vagrant dependencies
21+
if [[ "$B2D_INSTALL_MODE" == "full" ]] || [[ "$B2D_INSTALL_MODE" == "vm" ]] ; then
22+
# Install prerequisites via choco (virtualbox and vagrant)
23+
echo-green "Installing virtualbox and vagrant via choco..."
24+
curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.cmd -o $WINDIR/Temp/presetup-win.cmd
25+
curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.vbs -o $WINDIR/Temp/presetup-win.vbs
26+
echo-yellow "Setup needs administrator privileges to contiue..."
27+
cscript $WINDIR/Temp/presetup-win.vbs
2228
fi
2329

24-
# Install prerequisites via choco (virtualbox and vagrant)
25-
echo-green "Installing virtualbox and vagrant via choco..."
26-
curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.cmd -o $WINDIR/Temp/presetup-win.cmd
27-
curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.vbs -o $WINDIR/Temp/presetup-win.vbs
28-
echo-yellow "Setup needs administrator privileges to contiue..."
29-
cscript $WINDIR/Temp/presetup-win.vbs
30-
31-
# Remove old docker version
32-
rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
33-
# Install Docker
34-
echo-green "Installing docker cli v${DOCKER_VERSION}..."
35-
curl -sSL https://get.docker.com/builds/Windows/i386/docker-$DOCKER_VERSION.exe -o /usr/local/bin/docker.exe
36-
chmod +x /usr/local/bin/docker.exe
37-
38-
# Remove old docker-compose version
39-
rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
40-
# Install Docker Compose
41-
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
42-
curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe -o /usr/local/bin/docker-compose.exe
43-
chmod +x /usr/local/bin/docker-compose.exe
44-
45-
# Install winpty
46-
echo-green "Installing winpty (console) v$WINPTY_VERSION..."
47-
curl -sSL -O https://github.com/rprichard/winpty/releases/download/$WINPTY_VERSION/winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
48-
tar -xf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
49-
mv winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32/bin/* /usr/local/bin
50-
rm -rf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32*
51-
52-
# Git settings
53-
echo-green "Adjusting git defaults..."
54-
git config --global core.autocrlf input
55-
git config --system core.longpaths true
30+
# Docker and other dependencies
31+
if [[ "$B2D_INSTALL_MODE" == "full" ]] || [[ "$B2D_INSTALL_MODE" == "docker" ]] ; then
32+
# Remove old docker version
33+
rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
34+
# Install Docker
35+
echo-green "Installing docker cli v${DOCKER_VERSION}..."
36+
curl -sSL -O https://get.docker.com/builds/Windows/i386/docker-$DOCKER_VERSION.zip
37+
unzip docker-$DOCKER_VERSION.zip
38+
mv docker/* /usr/local/bin
39+
rm -rf docker-$DOCKER_VERSION*
40+
41+
# Remove old docker-compose version
42+
rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
43+
# Install Docker Compose
44+
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
45+
curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe -o /usr/local/bin/docker-compose.exe
46+
chmod +x /usr/local/bin/docker-compose.exe
47+
48+
# Install winpty
49+
echo-green "Installing winpty (console) v$WINPTY_VERSION..."
50+
curl -sSL -O https://github.com/rprichard/winpty/releases/download/$WINPTY_VERSION/winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
51+
tar -xf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz
52+
mv winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32/bin/* /usr/local/bin
53+
rm -rf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32*
54+
55+
# Git settings
56+
echo-green "Adjusting git defaults..."
57+
git config --global core.autocrlf input
58+
git config --system core.longpaths true
59+
fi

0 commit comments

Comments
 (0)