diff --git a/docs/changelog.md b/docs/changelog.md index 1d2aa8f4..e5a2e4b0 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,9 +1,13 @@ # Changelog -## 0.1.2 (In Progress) +## 0.1.3 (In Progress) + +## 0.1.2 (June 23, 2015) * NEW: Commands are now placed in a file, copied over to the container and the file containing the commands is run. This allows you to use & in your commands. * `repo` and `mount` keys in app specs are now optional + * We have switched to using docker-compose 1.3. https://github.com/docker/compose/releases/tag/1.3.0 + ## 0.1.1 (June 18, 2015) diff --git a/dusty/constants.py b/dusty/constants.py index 016bc5d6..cf79c0c6 100644 --- a/dusty/constants.py +++ b/dusty/constants.py @@ -46,7 +46,7 @@ 'virtualbox': '4.3.26', 'boot2docker': '1.6.0', 'docker': '1.6.0', - 'docker-compose': '1.2.0' + 'docker-compose': '1.3.0' } NGINX_CONFIG_FILE_LOCATIONS = ['/usr/local/nginx/conf', '/etc/nginx', '/usr/local/etc/nginx'] diff --git a/dusty/preflight.py b/dusty/preflight.py index 5bb4965b..f2116ca1 100644 --- a/dusty/preflight.py +++ b/dusty/preflight.py @@ -73,7 +73,7 @@ def _check_docker(): @returns_exception def _check_docker_compose(): _assert_executable_exists('docker-compose') - installed_version = subprocess.check_output(['docker-compose', '--version']).split(' ')[1].strip() + installed_version = subprocess.check_output(['docker-compose', '--version']).split('\n')[0].split()[-1].strip() _maybe_version_warning('docker-compose', installed_version) @returns_exception