Merge pull request #109 from blinkreaction/develop

Release v1.3.2

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.3.2 (2016-04-26)
+
+- dsh v1.13.1
+  - Fix regression with docker-compose related function calls introduced in dsh v1.13.0
+- Documentation fixes
+
+A full update is recommended. Please follow the updates instructions:
+https://github.com/blinkreaction/drude#updates
+
+
 ## 1.3.1 (2016-04-21)
 
 - A lot of refactoring to bring interactive shell experience to Windows (via winpty, which is a requirement now on Windows)

README.md

@@ -69,9 +69,9 @@ dsh bash
 
 Tools available inside the **cli** container:
 
-- php-cli, composer, drush[6,7,8], phpcs
+- php-cli, composer, drush[6,7,8], drupal console, phpcs
 - ruby, bundler
-- node, npm, bower, grunt
+- node, nvm, npm, bower, grunt
 - git, wget, zip, mysql-client
 - python
 
@@ -100,7 +100,7 @@ See [Troubleshooting](/docs/troubleshooting.md) section of the docs.
 
 The MIT License (MIT)
 
-Copyright (c) 2015 BlinkReaction
+Copyright (c) 2016 BlinkReaction
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

bin/dsh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DSH_VERSION=1.13.0
+DSH_VERSION=1.13.1
 
 # Console colors
 red='\033[0;31m'
@@ -122,7 +122,14 @@ get_mysql_connect ()
 # Use this function for every docker-compose invocation.
 docker_compose ()
 {
+	# docker-compose cannot find docker-compose.yml in the path if there are symlinks on the way
+	cwd=$(pwd)
+	cd $(yml_get_path)
+
 	docker-compose $*
+
+	# switch back to the original path
+	cd $cwd
 }
 
 # Get container id by service name
@@ -387,7 +394,6 @@ check_docker_host #perform this check in any case
 _start_containers ()
 {
 	echo-green "Starting containers..."
-	cd $(yml_get_path)
 	docker_compose up -d
 	_set_cli_uid
 }
@@ -396,7 +402,6 @@ _start_containers ()
 _restart_containers ()
 {
 	echo-green "Restarting containers..."
-	cd $(yml_get_path)
 	docker_compose restart $*
 	_set_cli_uid
 }
@@ -409,7 +414,6 @@ _stop_containers ()
 		# stop all but system containers (--label "group=system")
 		docker ps --format '{{.ID}} {{.Label "group"}}' | grep -v 'system' | xargs docker stop
 	fi
-	cd $(yml_get_path)
 	docker_compose stop
 }
 
@@ -419,7 +423,6 @@ _remove_containers ()
 	if [[ $1 == "" ]]; then
 		echo-yellow "Removing containers..."
 	fi
-	cd $(yml_get_path)
 	docker_compose kill $* && docker_compose rm -v --force $*
 }
 
@@ -596,7 +599,6 @@ status ()
 	if [[ "$1" == "-a" ]] || [[ "$1" == "--all" ]]; then
 		docker ps
 	else
-		cd $(yml_get_path)
 		docker_compose ps
 	fi
 }
@@ -1198,7 +1200,6 @@ reset ()
 # @param $* container(s) name
 logs ()
 {
-	cd $(yml_get_path)
 	docker_compose logs $*
 }
 

docs/drude-project-init.md

@@ -1,6 +1,6 @@
 # Initialize a Drude powered project
 
-Make sure the project has been configured to use Drude - [Configure a project to use Drude](/docs/drude-project-setup.md))
+Make sure the project has been configured to use Drude - [Configure a project to use Drude](/docs/drude-project-setup.md)
 
 If the project has the `.drude/drude-init.sh` script configured, then run:
 

docs/drude-project-setup.md

@@ -4,7 +4,7 @@ Initial configuration is done once per project (e.g. by a team lead) and committ
 
 `docker-compose.yml` file and an optional `.drude` folder are good indicators that a project is using Drude.  
 
-**On Windows** make sure your `projects` folder is **not** inside `%USERPROFILE%/.babun` installation folder.
+**On Windows** make sure your `projects` folder is **not** inside `%USERPROFILE%/.babun` folder.
 
 ## Setup
 
@@ -13,7 +13,7 @@ Initial configuration is done once per project (e.g. by a team lead) and committ
 3. Install Drude's docker stack configuration (this downloads the latest `docker-compose.yml` file):
 
     ```
-    dsh install drude
+    dsh install drude-config
     ```
 
 4. Update `docker-compose.yml` as necessary.