From 86cdb86f6d89fe818b16b8c8bc87bbe77bb328b1 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Mon, 24 Sep 2018 21:41:16 -0600 Subject: [PATCH] Don't use -y automatically on drush commands, fixes #1118, fixes #455 (#1120) --- containers/ddev-webserver/files/etc/drush/drushrc.php | 4 +++- pkg/ddevapp/ddevapp.go | 2 +- pkg/version/version.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/containers/ddev-webserver/files/etc/drush/drushrc.php b/containers/ddev-webserver/files/etc/drush/drushrc.php index 5b7dd00e744..f98efb165ce 100644 --- 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 index b34677313f9..c7c067a83fb 100644 --- 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 index 329ad54117d..82388998437 100644 --- 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"