Don't use -y automatically on drush commands, fixes #1118, fixes #455 (…

…#1120)
ddev · Sep 25, 2018 · 86cdb86 · 86cdb86
1 parent 737033b
commit 86cdb86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/containers/ddev-webserver/files/etc/drush/drushrc.php b/containers/ddev-webserver/files/etc/drush/drushrc.php
@@ -3,4 +3,6 @@
     $options['uri'] = $_ENV['DDEV_URL'];
 }
 # Skip confirmations since `ddev exec` cannot support interactive prompts
-$options['yes'] = 1;
+if (!empty($_ENV['DDEV_EXEC'])) {
+    $options['yes'] = 1;
+}
diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go
@@ -640,7 +640,7 @@ func (app *DdevApp) Start() error {
 func (app *DdevApp) Exec(service string, cmd ...string) (string, string, error) {
 	app.DockerEnv()
 
-	exec := []string{"exec", "-T", service}
+	exec := []string{"exec", "-e", "DDEV_EXEC=true", "-T", service}
 	exec = append(exec, cmd...)
 
 	files, err := app.ComposeFiles()

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -25,7 +25,7 @@ var DockerComposeFileFormatVersion = "3.6"
 var WebImg = "drud/ddev-webserver"
 
 // WebTag defines the default web image tag for drud dev
-var WebTag = "20180913_apache_broken_on_windows" // Note that this can be overridden by make
+var WebTag = "20180920_fix_drush_auto_yes" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "drud/ddev-dbserver"