add repack-variant #214
Merged
add repack-variant #214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bcressey
reviewed
May 14, 2024
|
Adjusts some things in the build system for preliminary support for an additional build target. Removes some unnecessary checks, references, and dependencies. Renames Dockerfile to build.Dockerfile and adds a common argument for future build targets to skip cleanup if desired. Signed-off-by: Patrick J.P. Culp <[email protected]>
|
Rebased. |
bcressey
approved these changes
May 14, 2024
tools/buildsys/src/manifest.rs
Outdated
| @@ -504,6 +504,7 @@ fn is_manifest_type(pkg_metadata: &PackageMetadata, manifest_type: BuildType) -> | |||
| BuildType::Package => metadata_table.get("build-package").is_some(), | |||
| BuildType::Kit => metadata_table.get("build-kit").is_some(), | |||
| BuildType::Variant => metadata_table.get("build-variant").is_some(), | |||
| BuildType::Repack => metadata_table.get("build-variant").is_some(), | |||
There was a problem hiding this comment.
This would be better as an error or an unreachable! - we shouldn't be taking this graph-walk path for a repack operation, and the longer we make it work before failing, the harder it will be to diagnose the logic error that let us reach this point.
There was a problem hiding this comment.
Since this function returns a bool, unreachable! might be cleanest.
|
webern
approved these changes
May 14, 2024
| @@ -504,6 +504,7 @@ fn is_manifest_type(pkg_metadata: &PackageMetadata, manifest_type: BuildType) -> | |||
| BuildType::Package => metadata_table.get("build-package").is_some(), | |||
| BuildType::Kit => metadata_table.get("build-kit").is_some(), | |||
| BuildType::Variant => metadata_table.get("build-variant").is_some(), | |||
| BuildType::Repack => unreachable!("Repacking is not defined in manifests"), | |||
There was a problem hiding this comment.
I don't like this. Let's just return false since that is an accurate answer to the question is_manifest_type. A function that can panic seems out of character for us.
Edit: I have learned that this was Ben's preference so go ahead and merge it like this. I hope to make this function go away at some point with some refactoring, but we'll see...
Suggested change
| BuildType::Repack => unreachable!("Repacking is not defined in manifests"), | |
| BuildType::Repack => false, |
Add the the initial target for repackaging a Bottlerocket variant. This target will skip the traditional workflow of building packages and using `rpm2img`. Instead the build system will point to a yet to be implemented `img2img` tool. Signed-off-by: Patrick J.P. Culp <[email protected]>
|
Adjusted some names and ordering. |
webern
approved these changes
May 14, 2024
bcressey
approved these changes
May 14, 2024
This was referenced May 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Add the the initial target for repackaging a Bottlerocket variant. This target will skip the traditional workflow of building packages and using
rpm2img. Instead the build system will point to a yet to be implementedimg2imgtool.Includes some preliminary housekeeping. Removes some unnecessary checks, references, and dependencies. Renames
Dockerfiletobuild.Dockerfileand adds a common argument for future build targets to skip cleanup if desired.Testing done:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.