Resolve #944

build/src/utils/config.js

@@ -469,10 +469,28 @@ function getParentTagForVersion(definitionId, version, registry, registryPath, v
     let parentId = config.definitionBuildSettings[definitionId].parent;
     if (parentId) {
         if(typeof parentId !== 'string') {
-            // Use variant to figure out correct parent, or return first if no variant
+            // Use variant to figure out correct parent, or return first parent if child has no variant
             parentId = variant ? parentId[variant] : parentId[Object.keys(parentId)[0]];
         }
-        return getTagsForVersion(parentId, version, registry, registryPath, variant)[0];
+
+        // Determine right parent variant to use (assuming there are variants)
+        const parentVariantList = getVariants(parentId);
+        let parentVariant;
+        if(parentVariantList) {
+            // If a variant is specified in the parentVariant property in build, use it - otherwise default to the child definition's variant
+            parentVariant = config.definitionBuildSettings[definitionId].parentVariant || variant;
+            if(typeof parentVariant !== 'string') {
+                // Use variant to figure out correct variant it not the same across all parents, or return first variant if child has no variant
+                parentVariant = variant ? parentVariant[variant] : parentVariant[Object.keys(parentId)[0]];
+            }
+            if(!parentVariantList.includes(parentVariant)) {
+                throw `Unable to determine variant for parent. Variant ${parentVariant} is not in ${parentId} list: ${parentVariantList}`;
+            }
+        }
+
+        // Parent image version may be different than child's
+        const parentVersion = getVersionFromRelease(version, definitionId);
+        return getTagsForVersion(parentId, parentVersion, registry, registryPath, parentVariant)[0];
     }
     return null;
 }

containers/java-8/definition-manifest.json

@@ -4,12 +4,13 @@
 		"latest": false,
 		"rootDistro": "debian",
 		"parent": "java",
+		"parentVariant": "11",
 		"tags": [
 			"java:${VERSION}-8"
 		]
 	},
 	"dependencies": {
-		"image": "openjdk:8-jdk-buster",
+		"image": "mcr.microsoft.com/vscode/devcontainers/java:11",
 		"imageLink": "https://hub.docker.com/_/java",
 		"apt": [{
 			"cgIgnore": false,

containers/jekyll/.devcontainer/base.Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/ruby:2
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:2.7
 COPY library-scripts/meta.env /usr/local/etc/vscode-dev-containers
 
 # ENV Variables required by Jekyll

containers/jekyll/definition-manifest.json

@@ -3,13 +3,14 @@
 	"build": {
 		"latest": true,
 		"parent": "ruby",
+		"parentVariant": "2.7",
 		"rootDistro": "debian",
 		"tags": [
 			"jekyll:${VERSION}"
 		]
 	},
 	"dependencies": {
-		"image": "mcr.microsoft.com/vscode/devcontainers/ruby:2",
+		"image": "mcr.microsoft.com/vscode/devcontainers/ruby:2.7",
 		"imageLink": "https://github.com/microsoft/vscode-dev-containers",
 		"debian": [{
 			"cgIgnore": false,