Skip to content

Commit 3b6c321

Browse files
Images release: Fix build error (devcontainers#333)
1 parent 2b3adb3 commit 3b6c321

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build/src/utils/config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,23 +564,23 @@ function getParentTagForVersion(definitionId, version, registry, registryPath, v
564564

565565
// Determine right parent variant to use (assuming there are variants)
566566
const parentVariantList = getVariants(parentId);
567-
let parentVariant;
567+
let parentVariantId;
568568
if(parentVariantList) {
569569
// If a variant is specified in the parentVariant property in build, use it - otherwise default to the child image's variant
570-
parentVariant = config.definitionBuildSettings[definitionId].parentVariant || variant;
570+
let parentVariant = config.definitionBuildSettings[definitionId].parentVariant || variant;
571571
if(typeof parentVariant !== 'string') {
572572
// Use variant to figure out correct variant it not the same across all parents, or return first variant if child has no variant
573573
parentVariant = variant ? parentVariant[variant] : parentVariant[Object.keys(parentId)[0]];
574574
}
575-
const parentVariantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
575+
parentVariantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
576576
if(!parentVariantList.includes(parentVariantId)) {
577577
throw `Unable to determine variant for parent. Variant ${parentVariantId} is not in ${parentId} list: ${parentVariantList}`;
578578
}
579579
}
580580

581581
// Parent image version may be different than child's
582582
const parentVersion = getVersionFromRelease(version, parentId);
583-
return getTagsForVersion(parentId, parentVersion, registry, registryPath, parentVariant)[0];
583+
return getTagsForVersion(parentId, parentVersion, registry, registryPath, parentVariantId)[0];
584584
}
585585
return null;
586586
}

0 commit comments

Comments
 (0)