From 0d6a70ce92548baef203fa3a53deff2588b957c9 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 22 Apr 2016 09:05:30 -0400 Subject: [PATCH 1/5] Update drude-project-setup.md dsh install drude-config --- docs/drude-project-setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/drude-project-setup.md b/docs/drude-project-setup.md index b27e0b5..0544c77 100644 --- a/docs/drude-project-setup.md +++ b/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. From 4b47573283b2a99768e2c5a11a994d746e3aa97b Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 22 Apr 2016 09:06:48 -0400 Subject: [PATCH 2/5] Update drude-project-init.md --- docs/drude-project-init.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drude-project-init.md b/docs/drude-project-init.md index ed4c4de..c81ca67 100644 --- a/docs/drude-project-init.md +++ b/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: From a76040a6100e959747c9bd187d1453f333c1568e Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 22 Apr 2016 09:09:01 -0400 Subject: [PATCH 3/5] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 72e83fb..a68e42f 100644 --- a/README.md +++ b/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 From 7d91192b862e320d2f699f1d96909c8caec61e5d Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Tue, 26 Apr 2016 10:01:31 -0400 Subject: [PATCH 4/5] Fix regression with docker_compose from dsh v1.13.0 docker-compose cannot find docker-compose.yml in the path if there are symlinks on the way Added back a woraround for this --- bin/dsh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/dsh b/bin/dsh index f67e2e6..d30f908 100755 --- a/bin/dsh +++ b/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 $* } From 186899ec98273b4d8ba9f16ed6b9a514a91676f5 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Tue, 26 Apr 2016 12:03:23 -0400 Subject: [PATCH 5/5] Version bump 1.3.2 --- CHANGELOG.md | 10 ++++++++++ VERSION | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e37a1d4..34999c7 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/VERSION b/VERSION index 6261a05..d5e98f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.1 \ No newline at end of file +1.3.2 \ No newline at end of file