Make ddev nvm work right again, fixes ddev#4499 (ddev#4620)

ptmkenny · Feb 9, 2023 · a9b53ba · a9b53ba
1 parent 969de43
commit a9b53ba
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/cmd/ddev/cmd/root_test.go b/cmd/ddev/cmd/root_test.go
@@ -165,8 +165,9 @@ func TestGetActiveAppRoot(t *testing.T) {
 
 	// And we should be able to stop it and find it as well
 	app, err := ddevapp.GetActiveApp("")
+	require.NoError(t, err)
 	err = app.Stop(false, true)
-	assert.NoError(err)
+	require.NoError(t, err)
 
 	t.Cleanup(func() {
 		err = os.Chdir(origDir)

diff --git a/containers/ddev-webserver/ddev-webserver-etc-skel/etc/skel/.bashrc b/containers/ddev-webserver/ddev-webserver-etc-skel/etc/skel/.bashrc
@@ -113,8 +113,8 @@ if ! shopt -oq posix; then
 fi
 
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && source "$NVM_DIR/bash_completion"
 
 for f in /etc/bashrc/*.bashrc; do
   source $f;

diff --git a/pkg/ddevapp/config.go b/pkg/ddevapp/config.go
@@ -875,6 +875,7 @@ func (app *DdevApp) RenderComposeYAML() (string, error) {
 	}
 
 	extraWebContent := "\nRUN mkdir -p /home/$username && chown $username /home/$username && chmod 600 /home/$username/.pgpass"
+	extraWebContent = extraWebContent + "\nENV NVM_DIR=/home/$username/.nvm"
 	if app.NodeJSVersion != nodeps.NodeJSDefault {
 		extraWebContent = extraWebContent + "\nRUN (apt-get remove -y nodejs || true) && (apt purge nodejs || true)"
 		// Download of setup_*.sh seems to fail a LOT, probably a problem on their end. So try it twice

diff --git a/pkg/ddevapp/nodejs_test.go b/pkg/ddevapp/nodejs_test.go
@@ -60,6 +60,16 @@ func TestNodeJSVersions(t *testing.T) {
 	assert.Contains(out, "Now using node v6")
 
 	out, err = exec.RunHostCommand(DdevBin, "nvm", "install", "8")
-	require.NoError(t, err)
+	require.NoError(t, err, "output=%v", out)
 	assert.Contains(out, "Now using node v8")
+	out, err = exec.RunHostCommand(DdevBin, "nvm", "use", "8")
+	require.NoError(t, err, "output=%v", out)
+	out, err = exec.RunHostCommand(DdevBin, "nvm", "alias", "default", "8")
+	require.NoError(t, err, "output=%v", out)
+
+	out, err = exec.RunHostCommand(DdevBin, "exec", "node", "--version")
+	require.NoError(t, err)
+
+	assert.Contains(out, "v8.17")
+
 }
diff --git a/pkg/versionconstants/versionconstants.go b/pkg/versionconstants/versionconstants.go
@@ -17,7 +17,7 @@ var SegmentKey = ""
 var WebImg = "drud/ddev-webserver"
 
 // WebTag defines the default web image tag
-var WebTag = "20230128_xdebug_build_time" // Note that this can be overridden by make
+var WebTag = "20230207_fix_nvm" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "drud/ddev-dbserver"