Skip to content

[pull] main from osbuild:main#14

Open
pull[bot] wants to merge 246 commits intocentos-workstation:mainfrom
osbuild:main
Open

[pull] main from osbuild:main#14
pull[bot] wants to merge 246 commits intocentos-workstation:mainfrom
osbuild:main

Conversation

@pull
Copy link

@pull pull bot commented Apr 8, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

pamolloy and others added 21 commits March 3, 2025 10:39
Signed-off-by: Wei Shi <wshi@redhat.com>
Bumps the go-deps group with 2 updates in the /bib directory: [github.com/cheggaaa/pb/v3](https://github.com/cheggaaa/pb) and [github.com/osbuild/images](https://github.com/osbuild/images).


Updates `github.com/cheggaaa/pb/v3` from 3.1.6 to 3.1.7
- [Commits](cheggaaa/pb@v3.1.6...v3.1.7)

Updates `github.com/osbuild/images` from 0.120.0 to 0.121.0
- [Release notes](https://github.com/osbuild/images/releases)
- [Commits](osbuild/images@v0.120.0...v0.121.0)

---
updated-dependencies:
- dependency-name: github.com/cheggaaa/pb/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go-deps
- dependency-name: github.com/osbuild/images
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit adds support for files/directories in blueprint
customizations.

This needs osbuild/images#1227

Closes: #834
This commit adds a full integration test for the files/dir blueprint
customizations.
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Add clarity about how when using a kickstart customization, other customization blocks are not supported. This is discussed here: #528
This release includes a fix for the issue that custom unmarshaled
toml was marked in the metadata as "Undecoded()" [0].

With that we can enable strict checking for blueprint configuration
again.

[0] BurntSushi/toml#425
When building the anaconda-iso from centos or fedora there is
a high chance to hit a bad mirror. The libcurl method is not
able to fallback to different mirrors so the user experience
is bad. Switch to librepo by default therefore.

Closes: #835
A major part of this update is the ability to use mount units instead of
defining mountpoints in /etc/fstab.

For bootc disk images, this is always enabled [1] and requires no
further configuration.

Closes #756

[1] osbuild/images@43f1a32
We need to import the fixtures and use them indirectly, which makes it
appear like an unused import.  Instead of disabling the linter on the
line, let's suppress the warning by using _ as the import name.

I find this nicer.
Some tests rely on reading the fstab options from the manifest to verify
that filesystems and swap partitions generate the right options.
These have been changed to instead look for
org.osbuild.systemd.unit.create stages with filenames ending in .mount
and .swap.
Some packages have been moved to `image-builder-cli`. Add this
dependency and move the import paths over.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This commit adds support for more debug for `qemu-user` options.
When settings:
```
$ sudo IMAGE_BUILDER_EXPERIMENAL=debug-qemu-user bootc-image-builder ...
```
extra debug from qemu-user will be printed.

This hopefully helps to track down the root cause of
podman-desktop/extension-bootc#1475
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6 to 7.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v6...v7)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the go-deps group in /bib with 1 update: [github.com/osbuild/images](https://github.com/osbuild/images).


Updates `github.com/osbuild/images` from 0.129.0 to 0.130.0
- [Release notes](https://github.com/osbuild/images/releases)
- [Commits](osbuild/images@v0.129.0...v0.130.0)

---
updated-dependencies:
- dependency-name: github.com/osbuild/images
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
@pull pull bot added the ⤵️ pull label Apr 8, 2025
achilleas-k and others added 4 commits April 9, 2025 14:50
This commit converts bib to use the new blueprint package from
github.com/osbuild/blueprint for better compatibility with
composer and our documentation.

It also bumps the version of the TOML library so that we get
PR#440.
By moving the LVM disk customization test to TOML we will
catch issues with our TOML parsing early, i.e. we can
catch the regression we encountered when applying strict
TOML parsing. This is also tested in
osbuild/blueprint#12 but having
it here again for good measure is a good idea.
@pull pull bot added the merge-conflict Resolve conflicts manually label Apr 9, 2025
dependabot bot and others added 3 commits April 11, 2025 06:28
Bumps the go-deps group in /bib with 1 update: [github.com/osbuild/blueprint](https://github.com/osbuild/blueprint).


Updates `github.com/osbuild/blueprint` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/osbuild/blueprint/releases)
- [Commits](osbuild/blueprint@v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/osbuild/blueprint
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sclorg/testing-farm-as-github-action](https://github.com/sclorg/testing-farm-as-github-action) from 3 to 4.
- [Release notes](https://github.com/sclorg/testing-farm-as-github-action/releases)
- [Commits](sclorg/testing-farm-as-github-action@v3...v4)

---
updated-dependencies:
- dependency-name: sclorg/testing-farm-as-github-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit enables testing for centos10 based installer
images.

The fix https://gitlab.com/libosinfo/osinfo-db/-/commit/fc811ba5a792967e22a0108de5a245b23da3cc66 is now released.
mvo5 and others added 30 commits November 21, 2025 10:02
And replace with ssh/scp binaries. This is probably more
robust than paramiko and more "standard". As a side effect
we do no longer request an explicit tty. We could force
that with "-t" in ssh but we did that with paramiko and
that caused issues that e.g. "systemctl" would detect
a tty and go into pager mode. So lets start without and
we can always add "-t" to our ssh invocation to force
it.
Small helper to retry ssh to avoid flakyness when a VM closes the
connection too early.
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
This will pull in
osbuild/images#2037
to fix a selinux label issue.

Thanks to Alex for fixing this in images.
Now that the "images" library contains the vmtest testing helpers
we use that and remove ouuse that and remove our own copy..
This ports the existing code to the new vmtest.vm.run() code as
proposed in images PR#2036.
Normally it's printed in all caps (unless it's all lowercase) and it's
consistent with JSON on the same line.
In the intro section for the build config, link to the blueprint
repository and reference guide on osbuild.org.  While we do describe
most (or perhaps all) supported options in the README, it's good to have
a link to the full docs for reference.
Bump images to a newer version to resolve issues with finding EFI
executables in containers with newer `bootupd` versions.

Closes #1173, #1171.

See this issue [1] for more background information.

[1]: osbuild/image-builder-cli#421

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
The constructor in `images` dropped the reference argument; let's drop
it here as well.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Update osbuild/blueprint dependency and add new ISO options to README.
We need this for the InVM option when running osbuild.

This also fixes the usage of fields in InstallerCustomizations that
were moved to ISOCustomizations.
This test was removed in image-builder-cli in:
 osbuild/image-builder-cli@06e181b
Because its no longer working. Do the same here.
If this is specified, the "image" pipeline (the main one) is run in a vm.
We install qemu-kvm-core to get a minimal qemu + virtiofsd.
This updates to the latest image-builder-cli, adding support for
rootless container use
(osbuild/image-builder-cli#445).

It also updates the use of related APIs to pass runInVm options where
needed.

With this, I was able to run a rootless bc-i-b conversion.

There is one problem, which is that if you mount
`~/.local/share/containers/storage` on the host to
`/var/lib/containers/storage` in the container, podman will complain
with:

```
Error: database static dir "~/.local/share/containers/storage/libpod"
does not match our static dir "/var/lib/containers/storage/libpod":
database configuration mismatch
```

Additionally, if you pass the host `/var/lib/containers/storage` into
the rootless container you will get read permission errors.

There are two workarounds for this. Either you can use e.g. skopeo to
copy the bootc container to a separate (non-root) container storage
directory and mount that, or you can cover the `db.sql` file in the
storage directory to make podman not print the error.

Neither of these are super clean, and we should try to figure out a
better solution, but for now I was at least able to run a complete
image build using the "cover db" apprach like this:

```
$ touch /tmp/foo
$ podman run --rm --security-opt label=type:unconfined_t -ti --privileged \
  --network=none -v $PWD/output:/output \
  -v ~/.local/share/containers/storage:/var/lib/containers/storage \
  -v /tmp/foo:/var/lib/containers/storage/db.sql \
  localhost/bootc-image-builder  --in-vm \
  --rootfs ext4 --type raw \
  quay.io/fedora/fedora-bootc:43
```
…work

This adds the commits from:
 * osbuild/image-builder-cli#447
 * osbuild/images#2167

And with this, we can run a rootless bc-i-b run without any workarounds
related to the container store:

```
$ podman run --rm --security-opt label=type:unconfined_t -ti --privileged \
  --network=none -v $PWD/output:/output \
  -v ~/.local/share/containers/storage:/var/lib/containers/storage \
  localhost/bootc-image-builder  --in-vm \
  --rootfs ext4 --type raw \
  quay.io/fedora/fedora-bootc:43
```

Note: For the above to work, localhost/bootc-image-builder needs to be
in the user container store.
The original workflow was merged but it was never functional. It was a
copy from the images repository and on top of that, Go source code is
under bib/ path so it never worked. Finally, gobump only updates to
stable versions of libraries while this repo needs nightly build of CLI
and it also uses the latest Go version.

Therefore, gobump is not necessary at all, replacing with a simple script.
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bump `images` to 0.246.0 which brings the capability to turn off default
kernel arguments for images and a lighter weight inspection method for
build containers.

Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
Use the newly introduced `BootcBuildInfo` to inspect the build
container. This function does much less than the full inspection and is
thus less error prone.

Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
Allow the user to prefer the omission of the default kernel arguments
from `images`. Sometimes these arguments are harmful to a use case.

In the future we likely do not want to ship kernel arguments at all and
prefer that users always configure them explicitly in the kernel or a
blueprint.

Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
To see if the tests pass with more.

Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
We can document rootless builds with `--in-vm` as experimental; just so
it's at least somewhat discoverable.

Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.