update preprocess file

Author: Mathiyarasy

src/spec-node/dockerCompose.ts

@@ -168,7 +168,7 @@ export async function buildAndExtendDockerCompose(configWithRaw: SubstitutedConf
 		const { context, dockerfilePath, target } = serviceInfo.build;
 		const resolvedDockerfilePath = cliHost.path.isAbsolute(dockerfilePath) ? dockerfilePath : path.resolve(context, dockerfilePath);
 		let originalDockerfile = (await cliHost.readFile(resolvedDockerfilePath)).toString();
-		if (params.isPodman && resolvedDockerfilePath.endsWith('.in')) {
+		if (resolvedDockerfilePath.endsWith('.in')) {
 			originalDockerfile = await preprocessDockerfileIn(resolvedDockerfilePath, cliHost.exec, output);
 		}
 		dockerfile = originalDockerfile;

src/spec-node/dockerfileUtils.ts

@@ -274,17 +274,16 @@ export async function preprocessDockerfileIn(dockerfilePath: string, exec: ExecF
 			exec,
 			cmd: 'cpp',
 			// -undef:               do not predefine platform/compiler macros
-			// -fdirectives-only:    only process directives, do not expand macros
 			// -w:                   suppress warnings
 			// -P:                   suppress linemarker output lines
-			args: ['-undef', '-fdirectives-only', '-w', '-P', dockerfilePath],
+			args: ['-P', dockerfilePath],
 			output,
 		});
 	} catch (err: any) {
 		if (err?.code === 'ENOENT' || err?.message?.includes('ENOENT')) {
 			throw new Error(
 				`Preprocessing '${dockerfilePath}' requires 'cpp', but it was not found on the host. ` +
-				`Please install cpp (e.g. "sudo apt-get install cpp") to use Dockerfile.in files with Podman.`
+				`Please install cpp (e.g. "sudo apt-get install cpp") to use Dockerfile.in files with devcontainers.`
 			);
 		}
 		const stderrText = err?.stderr ? `\n${(err.stderr as Buffer).toString()}` : '';

src/spec-node/singleContainer.ts

@@ -131,7 +131,7 @@ async function buildAndExtendImage(buildParams: DockerResolverParameters, config
 	}
 
 	let dockerfile = (await cliHost.readFile(dockerfilePath)).toString();
-	if (buildParams.isPodman && dockerfilePath.endsWith('.in')) {
+	if (dockerfilePath.endsWith('.in')) {
 		dockerfile = await preprocessDockerfileIn(dockerfilePath, cliHost.exec, output);
 	}
 	const originalDockerfile = dockerfile;