From bda32c5b39aed7696ddf209f1e198853e5c95cb1 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Sun, 31 May 2015 01:27:29 -0700 Subject: [PATCH] Adding compose binary to kitematic --- package.json | 1 + util/deps | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/package.json b/package.json index 1499f2db..1d8db74a 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ ], "docker-version": "1.6.2", "docker-machine-version": "0.2.0", + "docker-compose-version": "1.2.0", "electron-version": "0.26.0", "virtualbox-version": "4.3.28", "virtualbox-filename": "VirtualBox-4.3.28.pkg", diff --git a/util/deps b/util/deps index a1c7f603..a2f364c9 100755 --- a/util/deps +++ b/util/deps @@ -3,8 +3,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE=$DIR/.. DOCKER_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)") DOCKER_MACHINE_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-machine-version']" "$(cat $BASE/package.json)") +DOCKER_COMPOSE_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-compose-version']" "$(cat $BASE/package.json)") CURRENT_DOCKER_VERSION=$($BASE/resources/docker -v | cut -d ',' -f1 | awk '{print $3}' | cut -d '-' -f1) CURRENT_DOCKER_MACHINE_VERSION=$($BASE/resources/docker-machine -v | cut -d ',' -f1 | awk '{print $3}' | cut -d '-' -f1) +CURRENT_DOCKER_COMPOSE_VERSION=$($BASE/resources/docker-compose --version | cut -d ',' -f1 | awk '{print $2}' | cut -d '-' -f1) BOOT2DOCKER_FILE=boot2docker-$DOCKER_VERSION.iso pushd $BASE/resources > /dev/null @@ -27,6 +29,13 @@ if [ "$DOCKER_MACHINE_VERSION" != "$CURRENT_DOCKER_MACHINE_VERSION" ]; then chmod +x docker-machine fi +if [ "$DOCKER_COMPOSE_VERSION" != "$CURRENT_DOCKER_COMPOSE_VERSION" ]; then + echo "-----> Downloading Docker Compose CLI..." + rm -rf docker-compose + curl -L -o docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64 + chmod +x docker-compose +fi + if [ ! -f $BOOT2DOCKER_FILE ]; then echo "-----> Downloading Boot2Docker iso..." rm -rf boot2docker-*