Skip to content

Commit 30cd940

Browse files
Image build Fix - Regression (#321)
1 parent a872849 commit 30cd940

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build/src/utils/config.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,9 @@ function getParentTagForVersion(definitionId, version, registry, registryPath, v
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-
if(!parentVariantList.includes(parentVariant)) {
576-
throw `Unable to determine variant for parent. Variant ${parentVariant} is not in ${parentId} list: ${parentVariantList}`;
575+
const parentVariantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
576+
if(!parentVariantList.includes(parentVariantId)) {
577+
throw `Unable to determine variant for parent. Variant ${parentVariantId} is not in ${parentId} list: ${parentVariantList}`;
577578
}
578579
}
579580

src/java-8/manifest.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"latest": false,
99
"rootDistro": "debian",
1010
"parent": "base-debian",
11-
"idMismatch": "true",
1211
"architectures": {
1312
"bullseye": [
1413
"linux/amd64",

0 commit comments

Comments
 (0)