Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Images release: Fix build error
  • Loading branch information
samruddhikhandale committed Jan 17, 2023
commit c7a5890ffad46cc30bf3c8d3eafb7a669ec03bae
8 changes: 4 additions & 4 deletions build/src/utils/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -564,23 +564,23 @@ function getParentTagForVersion(definitionId, version, registry, registryPath, v

// Determine right parent variant to use (assuming there are variants)
const parentVariantList = getVariants(parentId);
let parentVariant;
let parentVariantId;
if(parentVariantList) {
// If a variant is specified in the parentVariant property in build, use it - otherwise default to the child image's variant
parentVariant = config.definitionBuildSettings[definitionId].parentVariant || variant;
let 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]];
}
const parentVariantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
parentVariantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
if(!parentVariantList.includes(parentVariantId)) {
throw `Unable to determine variant for parent. Variant ${parentVariantId} is not in ${parentId} list: ${parentVariantList}`;
}
}

// Parent image version may be different than child's
const parentVersion = getVersionFromRelease(version, parentId);
return getTagsForVersion(parentId, parentVersion, registry, registryPath, parentVariant)[0];
return getTagsForVersion(parentId, parentVersion, registry, registryPath, parentVariantId)[0];
}
return null;
}
Expand Down