Use recent phpmyadmin version (4.9) and stop using drud variant (#2010)

* Remove ddev-specific PHPMyAdmin
* Change to use upstream PHPMyAdmin instead of ddev-specific
* Add test to make sure PHPMyAdmin and MailHog are working

pkg/ddevapp/ddevapp_test.go

@@ -957,6 +957,12 @@ func TestDdevFullSiteSetup(t *testing.T) {
 
 		err = app.Start()
 		assert.NoError(err)
+
+		// Validate PHPMyAdmin is working and database named db is present
+		_, _ = testcommon.EnsureLocalHTTPContent(t, app.GetHTTPURL()+":8036/tbl_create.php?server=1&db=db", "Table name:")
+		// Validate MailHog is working and "connected"
+		_, _ = testcommon.EnsureLocalHTTPContent(t, app.GetHTTPURL()+":8025/#", "Connected")
+
 		settingsLocation, err := app.DetermineSettingsPathLocation()
 		assert.NoError(err)
 		assert.Equal(filepath.Dir(settingsLocation), filepath.Dir(app.SiteSettingsPath))
@@ -1011,6 +1017,7 @@ func TestDdevFullSiteSetup(t *testing.T) {
 		runTime()
 		switchDir()
 	}
+	fmt.Print()
 }
 
 // TestDdevRestoreSnapshot tests creating a snapshot and reverting to it. This runs with Mariadb 10.2

pkg/version/version.go

@@ -58,10 +58,10 @@ var DBImg = "drud/ddev-dbserver"
 var BaseDBTag = "v1.12.0"
 
 // DBAImg defines the default phpmyadmin image tag used for applications.
-var DBAImg = "drud/phpmyadmin"
+var DBAImg = "phpmyadmin/phpmyadmin"
 
 // DBATag defines the default phpmyadmin image tag used for applications.
-var DBATag = "v1.12.0" // Note that this can be overridden by make
+var DBATag = "4.9" // Note that this can be overridden by make
 
 // BgsyncImg defines the default bgsync image tag used for applications.
 var BgsyncImg = "drud/ddev-bgsync"