Don't set DRUSH_OPTIONS_URI if disable_settings_management, fixes #2443…

… (#2506)
ddev · Sep 16, 2020 · 4c277d3 · 4c277d3
1 parent cc621d1
commit 4c277d3
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 58 deletions.
diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -643,36 +643,37 @@ func (app *DdevApp) CheckDeprecations() {
 }
 
 type composeYAMLVars struct {
-	Name                  string
-	Plugin                string
-	AppType               string
-	MailhogPort           string
-	DBAPort               string
-	DBPort                string
-	DdevGenerated         string
-	HostDockerInternalIP  string
-	ComposeVersion        string
-	MountType             string
-	WebMount              string
-	WebBuildContext       string
-	DBBuildContext        string
-	WebBuildDockerfile    string
-	DBBuildDockerfile     string
-	SSHAgentBuildContext  string
-	OmitDB                bool
-	OmitDBA               bool
-	OmitSSHAgent          bool
-	NFSMountEnabled       bool
-	NFSSource             string
-	DockerIP              string
-	IsWindowsFS           bool
-	NoProjectMount        bool
-	Hostnames             []string
-	Timezone              string
-	Username              string
-	UID                   string
-	GID                   string
-	AutoRestartContainers bool
+	Name                      string
+	Plugin                    string
+	AppType                   string
+	MailhogPort               string
+	DBAPort                   string
+	DBPort                    string
+	DdevGenerated             string
+	HostDockerInternalIP      string
+	ComposeVersion            string
+	DisableSettingsManagement bool
+	MountType                 string
+	WebMount                  string
+	WebBuildContext           string
+	DBBuildContext            string
+	WebBuildDockerfile        string
+	DBBuildDockerfile         string
+	SSHAgentBuildContext      string
+	OmitDB                    bool
+	OmitDBA                   bool
+	OmitSSHAgent              bool
+	NFSMountEnabled           bool
+	NFSSource                 string
+	DockerIP                  string
+	IsWindowsFS               bool
+	NoProjectMount            bool
+	Hostnames                 []string
+	Timezone                  string
+	Username                  string
+	UID                       string
+	GID                       string
+	AutoRestartContainers     bool
 }
 
 // RenderComposeYAML renders the contents of .ddev/.ddev-docker-compose*.
@@ -699,34 +700,35 @@ func (app *DdevApp) RenderComposeYAML() (string, error) {
 	uid, gid, username := util.GetContainerUIDGid()
 
 	templateVars := composeYAMLVars{
-		Name:                  app.Name,
-		Plugin:                "ddev",
-		AppType:               app.Type,
-		MailhogPort:           GetPort("mailhog"),
-		DBAPort:               GetPort("dba"),
-		DBPort:                GetPort("db"),
-		DdevGenerated:         DdevFileSignature,
-		HostDockerInternalIP:  hostDockerInternalIP,
-		ComposeVersion:        version.DockerComposeFileFormatVersion,
-		OmitDB:                nodeps.ArrayContainsString(app.GetOmittedContainers(), "db"),
-		OmitDBA:               nodeps.ArrayContainsString(app.GetOmittedContainers(), "dba") || nodeps.ArrayContainsString(app.OmitContainers, "db"),
-		OmitSSHAgent:          nodeps.ArrayContainsString(app.GetOmittedContainers(), "ddev-ssh-agent"),
-		NFSMountEnabled:       app.NFSMountEnabled || app.NFSMountEnabledGlobal,
-		NFSSource:             "",
-		IsWindowsFS:           runtime.GOOS == "windows",
-		NoProjectMount:        app.NoProjectMount,
-		MountType:             "bind",
-		WebMount:              "../",
-		Hostnames:             app.GetHostnames(),
-		Timezone:              app.Timezone,
-		Username:              username,
-		UID:                   uid,
-		GID:                   gid,
-		WebBuildContext:       app.GetConfigPath("web-build"),
-		DBBuildContext:        app.GetConfigPath("db-build"),
-		WebBuildDockerfile:    app.GetConfigPath(".webimageBuild/Dockerfile"),
-		DBBuildDockerfile:     app.GetConfigPath(".dbimageBuild/Dockerfile"),
-		AutoRestartContainers: globalconfig.DdevGlobalConfig.AutoRestartContainers,
+		Name:                      app.Name,
+		Plugin:                    "ddev",
+		AppType:                   app.Type,
+		MailhogPort:               GetPort("mailhog"),
+		DBAPort:                   GetPort("dba"),
+		DBPort:                    GetPort("db"),
+		DdevGenerated:             DdevFileSignature,
+		HostDockerInternalIP:      hostDockerInternalIP,
+		ComposeVersion:            version.DockerComposeFileFormatVersion,
+		DisableSettingsManagement: app.DisableSettingsManagement,
+		OmitDB:                    nodeps.ArrayContainsString(app.GetOmittedContainers(), "db"),
+		OmitDBA:                   nodeps.ArrayContainsString(app.GetOmittedContainers(), "dba") || nodeps.ArrayContainsString(app.OmitContainers, "db"),
+		OmitSSHAgent:              nodeps.ArrayContainsString(app.GetOmittedContainers(), "ddev-ssh-agent"),
+		NFSMountEnabled:           app.NFSMountEnabled || app.NFSMountEnabledGlobal,
+		NFSSource:                 "",
+		IsWindowsFS:               runtime.GOOS == "windows",
+		NoProjectMount:            app.NoProjectMount,
+		MountType:                 "bind",
+		WebMount:                  "../",
+		Hostnames:                 app.GetHostnames(),
+		Timezone:                  app.Timezone,
+		Username:                  username,
+		UID:                       uid,
+		GID:                       gid,
+		WebBuildContext:           app.GetConfigPath("web-build"),
+		DBBuildContext:            app.GetConfigPath("db-build"),
+		WebBuildDockerfile:        app.GetConfigPath(".webimageBuild/Dockerfile"),
+		DBBuildDockerfile:         app.GetConfigPath(".dbimageBuild/Dockerfile"),
+		AutoRestartContainers:     globalconfig.DdevGlobalConfig.AutoRestartContainers,
 	}
 	if app.NFSMountEnabled || app.NFSMountEnabledGlobal {
 		templateVars.MountType = "volume"

diff --git a/pkg/ddevapp/templates.go b/pkg/ddevapp/templates.go
@@ -121,7 +121,9 @@ services:
       - DDEV_WEBSERVER_TYPE
       - DDEV_XDEBUG_ENABLED
       - DEPLOY_NAME=local
+{{ if not .DisableSettingsManagement }}
       - DRUSH_OPTIONS_URI=$DDEV_PRIMARY_URL
+{{ end }}
       - DOCKER_IP={{ .DockerIP }}
       - HOST_DOCKER_INTERNAL_IP={{ .HostDockerInternalIP }}
       # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.site:<port>