nits

Author: chrmarti

src/spec-node/dockerCompose.ts

@@ -188,7 +188,7 @@ export async function buildAndExtendDockerCompose(configWithRaw: SubstitutedConf
 
 	// determine whether we need to extend with features
 	const version = parseVersion((await params.dockerComposeCLI()).version);
-	const supportsAdditionalBuildContexts = params.cliVariant !== CLIVariant.Podman && params.cliVariant !== CLIVariant.Wslc && version && !isEarlierVersion(version, [2, 17, 0]);
+	const supportsAdditionalBuildContexts = params.cliVariant === CLIVariant.Docker && version && !isEarlierVersion(version, [2, 17, 0]);
 	const optionalBuildKitParams = supportsAdditionalBuildContexts ? params : { ...params, buildKitVersion: undefined };
 	const extendImageBuildInfo = await getExtendImageBuildInfo(optionalBuildKitParams, configWithRaw, baseName, imageBuildInfo, composeService.user, additionalFeatures, canAddLabelsToContainer);
 

src/spec-node/singleContainer.ts

@@ -361,13 +361,13 @@ export async function spawnDevContainer(params: DockerResolverParameters, config
 
 	const featureArgs: string[] = [];
 	// wslc does not support --init, --privileged, --cap-add, or --security-opt
-	if (mergedConfig.init && params.cliVariant !== CLIVariant.Wslc) {
-		featureArgs.push('--init');
-	}
-	if (mergedConfig.privileged && params.cliVariant !== CLIVariant.Wslc) {
-		featureArgs.push('--privileged');
-	}
 	if (params.cliVariant !== CLIVariant.Wslc) {
+		if (mergedConfig.init) {
+			featureArgs.push('--init');
+		}
+		if (mergedConfig.privileged) {
+			featureArgs.push('--privileged');
+		}
 		for (const cap of mergedConfig.capAdd || []) {
 			featureArgs.push('--cap-add', cap);
 		}

src/spec-shutdown/dockerUtils.ts

@@ -198,7 +198,11 @@ export async function removeContainer(params: DockerCLIParameters | PartialExecP
 						});
 					});
 				}
-				await Promise.race([removedSeenP || delay(1000), delay(1000)]);
+				if (removedSeenP) {
+					await Promise.race([removedSeenP, delay(1000)]);
+				} else {
+					await delay(1000);
+				}
 			}
 		}
 	} finally {