Skip to content

Commit

Permalink
[DEVENV] Install docker-compose v1.8.1 locally
Browse files Browse the repository at this point in the history
We need docker-compose v1.8.1 but baseimage v0.2.1 includes
v1.5.2.  We will eventually be migrating away from the
vagrant baseimage anyway, so we are going to pretend
docker-compose is not installed regardless of whether
it might be or not.  We will instead plow it over with
the release that we require.

Users will need to vagrant destroy+up after this patch

Change-Id: I7ae5eb87953466fadf1a7b5fb272633c35f67898
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
  • Loading branch information
ghaskins committed Nov 21, 2016
1 parent 7e7c7bb commit eb90b88
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions devenv/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ case "${DOCKER_STORAGE_BACKEND}" in
exit 1;;
esac

# Install docker-compose
curl -L https://github.com/docker/compose/releases/download/1.8.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose

# Configure docker
DOCKER_OPTS="-s=${DOCKER_STORAGE_BACKEND_STRING} -r=true --api-cors-header='*' -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock ${DOCKER_OPTS}"
sed -i.bak '/^DOCKER_OPTS=/{h;s|=.*|=\"'"${DOCKER_OPTS}"'\"|};${x;/^$/{s||DOCKER_OPTS=\"'"${DOCKER_OPTS}"'\"|;H};x}' /etc/default/docker
Expand Down

0 comments on commit eb90b88

Please sign in to comment.