Merge pull request #105 from devcontainers/samruddhikhandale/fix-java

Java: Tag 17 incorrectly points to java 11

Author: samruddhikhandale

build/src/prep.js

@@ -232,20 +232,19 @@ function replaceVariantArg(prepResult) {
 
 function addBuildArguments(prepResult) {
     const buildSettings = configUtils.getBuildSettings(prepResult.meta.definitionId);
-    let argList = '';
 
     for (let buildArg in buildSettings.buildArgs || {}) {
-        argList = argList + `ARG ${buildArg}="${buildSettings.buildArgs[buildArg]}"\n`;
+        prepResult.devContainerDockerfileModified = `ARG ${buildArg}="${buildSettings.buildArgs[buildArg]}"\n` + prepResult.devContainerDockerfileModified;
     }
 
     if (buildSettings.variantBuildArgs) {
         for (let buildArg in buildSettings.variantBuildArgs[prepResult.meta.variant] || {}) {
-            argList = argList + `ARG ${buildArg}="${buildSettings.variantBuildArgs[prepResult.meta.variant][buildArg]}"\n`;
+            const arg = `ARG ${buildArg}="${buildSettings.variantBuildArgs[prepResult.meta.variant][buildArg]}"`;
+            prepResult.devContainerDockerfileModified = (prepResult.devContainerDockerfileModified).replace(new RegExp(`.*${buildArg}=.*`), arg);
         }
     }
 
-    let dockerFileContentsWithArguments = argList + prepResult.devContainerDockerfileModified;
-    return dockerFileContentsWithArguments;
+    return prepResult.devContainerDockerfileModified;
 }
 
 module.exports = {

src/java/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "0.205.7",
+	"version": "0.205.8",
 	"variants": [
 		"17-bullseye",
 		"17-buster",
@@ -23,7 +23,7 @@
 				"BASE_IMAGE_VERSION_CODENAME": "buster"
 			},
 			"11-buster": {
-				"JAVA_IMAGE_TAG": "11",
+				"TARGET_JAVA_VERSION": "11",
 				"BASE_IMAGE_VERSION_CODENAME": "buster"
 			}
 		},