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

Commit

Permalink
Remove old docker/docker-compose version on Mac and Win
Browse files Browse the repository at this point in the history
  • Loading branch information
lmakarov committed Jun 3, 2016
1 parent 74a684f commit 3723c0f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions scripts/presetup-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,16 @@ VBoxManage hostonlyif remove vboxnet0 > /dev/null 2>&1
echo-green "Installing vagrant..."
brew cask install vagrant

# Remove old docker version
sudo rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
# Install docker
echo-green "Installing docker cli v${DOCKER_VERSION}..."
[ -f "/usr/local/bin/docker" ] && sudo rm /usr/local/bin/docker
sudo curl -sSL "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-$DOCKER_VERSION" -o /usr/local/bin/docker
sudo chmod +x /usr/local/bin/docker

# Remove old docker-compose version
sudo rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
# Install docker-compose
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
[ -f "/usr/local/bin/docker-compose" ] && sudo rm /usr/local/bin/docker-compose
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
sudo chmod +x /usr/local/bin/docker-compose
4 changes: 2 additions & 2 deletions scripts/presetup-win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ curl -sSL https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${
echo-yellow "Setup needs administrator privileges to contiue..."
cscript $WINDIR/Temp/presetup-win.vbs

# Remove old docker version (prior to boot2docker-vagrant v1.5.1)
# Remove old docker version
rm -f /usr/local/bin/docker >/dev/null 2>&1 || true
# Install Docker
echo-green "Installing docker cli v${DOCKER_VERSION}..."
curl -sSL https://get.docker.com/builds/Windows/i386/docker-$DOCKER_VERSION.exe -o /usr/local/bin/docker.exe
chmod +x /usr/local/bin/docker.exe

# Remove old docker-compose version (prior to boot2docker-vagrant v1.5.1)
# Remove old docker-compose version
rm -f /usr/local/bin/docker-compose >/dev/null 2>&1 || true
# Install Docker Compose
echo-green "Installing docker-compose v${DOCKER_COMPOSE_VERSION}..."
Expand Down

0 comments on commit 3723c0f

Please sign in to comment.