correct merge

Author: joshspicer

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Notable changes.
 
+## April 2023
+
+### [0.37.0]
+
+- Add --config to build command (microsoft/vscode-remote-release#8068)
+- Features/Templates: Fix a bug in reading from docker credential helpers (https://github.com/devcontainers/cli/issues/477)
+
 ## March 2023
 
 ### [0.36.0]

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.36.0",
+	"version": "0.37.0",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},

src/spec-configuration/httpOCIRegistry.ts

@@ -205,7 +205,6 @@ async function existsInPath(filename: string): Promise<boolean> {
 	return false;
 }
 
-
 async function getCredentialFromDockerConfigOrCredentialHelper(params: CommonParams, registry: string) {
 	const { output } = params;
 
@@ -291,7 +290,7 @@ async function getCredentialFromHelper(params: CommonParams, registry: string, c
 	try {
 		const { stdout } = await runCommandNoPty({
 			exec: plainExec(undefined),
-			cmd: 'docker-credential-'+credHelperName,
+			cmd: 'docker-credential-' + credHelperName,
 			args: ['get'],
 			stdin: Buffer.from(registry, 'utf-8'),
 			output,
@@ -306,7 +305,7 @@ async function getCredentialFromHelper(params: CommonParams, registry: string, c
 	}
 
 	let errors: jsonc.ParseError[] = [];
-	const creds:CredentialHelperResult = jsonc.parse(helperOutput.toString(), errors);
+	const creds: CredentialHelperResult = jsonc.parse(helperOutput.toString(), errors);
 	if (errors.length !== 0) {
 		output.write(`[httpOci] Credential helper ${credHelperName} returned non-JSON response "${helperOutput.toString()}" for registry ${registry}`, LogLevel.Warning);
 		return undefined;