Skip to content
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

main: add --use-librepo to support librepo downloads #51

Merged
merged 6 commits into from
Jan 17, 2025
Merged

main: add --use-librepo to support librepo downloads #51

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8c905c
go.mod: move to latest snapshot
mvo5 Jan 17, 2025
04616ca
main: add experimental `--use-librepo` to support librepo downloads
mvo5 Jan 7, 2025
5c15f1d
ibcli: introduce/use manifestOptions struct
mvo5 Jan 15, 2025
e726d7f
manifestgen: make depsolve return the full dnfjson.DepsolveResult
mvo5 Jan 16, 2025
157268c
main: make "--use-librepo" the default
mvo5 Jan 17, 2025
febc133
test: add new `test_container_builds_image_librepo` test
mvo5 Jan 8, 2025
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
2 changes: 1 addition & 1 deletion cmd/image-builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ operating sytsems like centos and RHEL with easy customizations support.`,
manifestCmd.Flags().String("ostree-ref", "", `OSTREE reference`)
manifestCmd.Flags().String("ostree-parent", "", `OSTREE parent`)
manifestCmd.Flags().String("ostree-url", "", `OSTREE url`)
manifestCmd.Flags().Bool("use-librepo", false, `(experimental) use librepo to download packages, needs new osbuild`)
manifestCmd.Flags().Bool("use-librepo", true, `use librepo to download packages (disable if you use old versions of osbuild)`)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can 'just' bump the minimum required osbuild version instead of this remark; let's do that.

rootCmd.AddCommand(manifestCmd)

buildCmd := &cobra.Command{
Expand Down
8 changes: 6 additions & 2 deletions image-builder-cli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
%bcond_with tests
%bcond_with relax_requires

# The minimum required osbuild version
%global min_osbuild_version 129
# The minimum required osbuild version, note that this used to be 129
# but got bumped to 138 for librepo support which is not strictly
# required. So if this needs backport to places where there is no
# recent osbuild available we could simply make --use-librepo false
# and go back to 129.
Comment on lines +6 to +10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a realistic issue? I guess it might be if you're go installing ib-cli, but in that case, you're on your own and the spec file doesn't matter.

I mean, there's no way this spec file will be used to officially build ib-cli in a distro where a new enough osbuild wont be, so I think this note isn't relevant.

I might be missing something though.

%global min_osbuild_version 138

%global goipath github.com/osbuild/image-builder-cli

Expand Down