Skip to content

Image build Fix - Regression #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2023
Merged

Image build Fix - Regression #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Image build Fix - Regression
  • Loading branch information
@samruddhikhandale
samruddhikhandale committed Jan 11, 2023
commit 04a388c425145a99540d48fb73277eec3771a215
5 changes: 3 additions & 2 deletions build/src/utils/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,9 @@ function getParentTagForVersion(definitionId, version, registry, registryPath, v
// 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}`;
const 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}`;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/java-8/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"latest": false,
"rootDistro": "debian",
"parent": "base-debian",
"idMismatch": "true",
"architectures": {
"bullseye": [
"linux/amd64",
Expand Down