Coalescing home directory for remoteUser following commons-utils logic

devcontainers · Mar 22, 2024 · a98cb17 · a98cb17
1 parent 05ae9d8
commit a98cb17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -106,4 +106,4 @@
 		"vscode-uri": "^3.0.8",
 		"yargs": "~17.7.2"
 	}
-}
+}
diff --git a/src/spec-configuration/containerFeaturesConfiguration.ts b/src/spec-configuration/containerFeaturesConfiguration.ts
@@ -291,11 +291,14 @@ function escapeQuotesForShell(input: string) {
 
 export function getFeatureLayers(featuresConfig: FeaturesConfig, containerUser: string, remoteUser: string, isBuildah = false, useBuildKitBuildContexts = false, contentSourceRootPath = '/tmp/build-features') {
 
+	const coalesceHomeDir = (user: string) => `$(if [ -d "$(${getEntPasswdShellCommand(user)} | cut -d: -f6)" ]; then echo "$(${getEntPasswdShellCommand(user)} | cut -d: -f6)"; else echo "/home/${user}"; fi)`;
+
 	const useSELinuxLabel = process.platform === 'linux' && isBuildah;
+
 	const builtinsEnvFile = `${path.posix.join(FEATURES_CONTAINER_TEMP_DEST_FOLDER, 'devcontainer-features.builtin.env')}`;
 	let result = `RUN \\
 echo "_CONTAINER_USER_HOME=$(${getEntPasswdShellCommand(containerUser)} | cut -d: -f6)" >> ${builtinsEnvFile} && \\
-echo "_REMOTE_USER_HOME=$(${getEntPasswdShellCommand(remoteUser)} | cut -d: -f6)" >> ${builtinsEnvFile}
+echo "_REMOTE_USER_HOME=${coalesceHomeDir(remoteUser)}" >> ${builtinsEnvFile}
 
 `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,4 +106,4 @@ @@
     		"vscode-uri": "^3.0.8",
     		"yargs": "~17.7.2"
     	}
-    }
+    }