Merge pull request #280 from gamechanger/ae-upgrade_docker-compose

prepare dusty to handle docker-compose 1.3 will write a new script to help migrate over gamechanger peopel

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)

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']

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