Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,18 @@ jobs:

- *apt_install_dependencies

- run: sudo apt install -y qemu-user-static
- run: sudo apt install -y qemu-user-static dnf

- uses: actions/checkout@v5
with:
path: osbuild
repository: osbuild/osbuild
ref: main

- name: install osbuild
run:
cd osbuild
sudo python3 -m pip install --break-system-packages -e .

- name: Check out code into the Go module directory
uses: actions/checkout@v5
Expand Down
7 changes: 6 additions & 1 deletion cmd/gen-manifests/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/osbuild/images/pkg/manifest"
"github.com/osbuild/images/pkg/manifestgen"
"github.com/osbuild/images/pkg/manifestgen/manifestmock"
"github.com/osbuild/images/pkg/osbuild"
"github.com/osbuild/images/pkg/ostree"
"github.com/osbuild/images/pkg/rhsm/facts"
"github.com/osbuild/images/pkg/rpmmd"
Expand Down Expand Up @@ -260,6 +261,10 @@ func makeManifestJob(
}()
msgq <- fmt.Sprintf("Starting job %s", filename)

opts := &manifest.SerializeOptions{
RpmDownloader: osbuild.RpmDownloaderLibrepo,
}

manifest, _, err := imgType.Manifest(&bp, options, repos, &seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)
Expand Down Expand Up @@ -303,7 +308,7 @@ func makeManifestJob(
commitSpecs = manifestmock.ResolveCommits(manifest.GetOSTreeSourceSpecs())
}

mf, err := manifest.Serialize(depsolvedSets, containerSpecs, commitSpecs, nil)
mf, err := manifest.Serialize(depsolvedSets, containerSpecs, commitSpecs, opts)
if err != nil {
return fmt.Errorf("[%s] manifest serialization failed: %s", filename, err.Error())
}
Expand Down
121 changes: 120 additions & 1 deletion data/distrodefs/fedora/imagetypes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,7 @@ image_types:
- "distro"
- "customizations.installer"

"minimal-installer":
"minimal-installer": &minimal_installer
name_aliases: ["image-installer", "fedora-image-installer"]
filename: "installer.iso"
mime_type: "application/x-iso9660-image"
Expand Down Expand Up @@ -1761,6 +1761,125 @@ image_types:
- *anaconda_pkgset
supported_blueprint_options: *supported_options_anaconda

"bootc-installer":
<<: *minimal_installer
# unset aliases
name_aliases:
package_sets:
installer:
- include:
# from bootc-image-builder:distrodefs
- aajohan-comfortaa-fonts
- abattis-cantarell-fonts
- alsa-firmware
- alsa-tools-firmware
- anaconda
- anaconda-dracut
- anaconda-install-img-deps
- anaconda-widgets
- atheros-firmware
- audit
- bind-utils
- bitmap-fangsongti-fonts
- brcmfmac-firmware
- bzip2
- cryptsetup
- curl
- dbus-x11
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- device-mapper-persistent-data
- dmidecode
- dnf
- dracut-config-generic
- dracut-network
- efibootmgr
- ethtool
- fcoe-utils
- ftp
- gdb-gdbserver
- gdisk
- glibc-all-langpacks
- gnome-kiosk
- google-noto-sans-cjk-ttc-fonts
- grub2-tools
- grub2-tools-extra
- grub2-tools-minimal
- grubby
- gsettings-desktop-schemas
- hdparm
- hexedit
- hostname
- initscripts
- ipmitool
- iwlwifi-dvm-firmware
- iwlwifi-mvm-firmware
- jomolhari-fonts
- kbd
- kbd-misc
- kdump-anaconda-addon
- kernel
- khmeros-base-fonts
- less
- libblockdev-lvm-dbus
- libibverbs
- libreport-plugin-bugzilla
- libreport-plugin-reportuploader
- librsvg2
- linux-firmware
- lldpad
- lsof
- madan-fonts
- mt-st
- mtr
- net-tools
- nfs-utils
- nm-connection-editor
- nmap-ncat
- nss-tools
- openssh-clients
- openssh-server
- ostree
- pciutils
- perl-interpreter
- pigz
- plymouth
- prefixdevname
- python3-pyatspi
- rdma-core
- realtek-firmware
- rit-meera-new-fonts
- rng-tools
- rpcbind
- rpm-ostree
- rsync
- rsyslog
- selinux-policy-targeted
- sg3_utils
- sil-abyssinica-fonts
- sil-padauk-fonts
- smartmontools
- spice-vdagent
- strace
- systemd
- tar
- tigervnc-server-minimal
- tigervnc-server-module
- udisks2
- udisks2-iscsi
- usbutils
- vim-minimal
- volume_key
- wget
- xfsdump
- xfsprogs
- xorg-x11-drivers
- xorg-x11-fonts-misc
- xorg-x11-server-Xorg
- xorg-x11-xauth
- xrdb
- xz

container: &container
filename: "container.tar"
mime_type: "application/x-tar"
Expand Down
100 changes: 99 additions & 1 deletion data/distrodefs/rhel-10/imagetypes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1591,7 +1591,7 @@ image_types:
- "centos-release"


"image-installer":
"image-installer": &image_installer
filename: "installer.iso"
mime_type: "application/x-iso9660-image"
bootable: true
Expand Down Expand Up @@ -1746,6 +1746,104 @@ image_types:
include:
- "dmidecode"

"bootc-installer":
<<: *image_installer
package_sets:
installer:
- include:
# from bootc-image-builder distrodefs
- "@hardware-support"
- alsa-firmware
- alsa-tools-firmware
- anaconda
- anaconda-dracut
- anaconda-install-img-deps
- anaconda-widgets
- audit
- bind-utils
- bzip2
- cryptsetup
- curl
- dbus-x11
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- device-mapper-persistent-data
- dmidecode
- dnf
- dracut-config-generic
- dracut-network
- efibootmgr
- ethtool
- fcoe-utils
- ftp
- gdb-gdbserver
- glibc-all-langpacks
- gnome-kiosk
- google-noto-sans-cjk-ttc-fonts
- grub2-tools
- grub2-tools-extra
- grub2-tools-minimal
- grubby
- gsettings-desktop-schemas
- hdparm
- hexedit
- hostname
- initscripts
- ipmitool
- jomolhari-fonts
- kbd
- kbd-misc
- kdump-anaconda-addon
- kernel
- less
- libblockdev-lvm-dbus
- libibverbs
- librsvg2
- linux-firmware
- lldpad
- lsof
- madan-fonts
- mt-st
- mtr
- net-tools
- nfs-utils
- nm-connection-editor
- nmap-ncat
- nss-tools
- openssh-clients
- openssh-server
- ostree
- pciutils
- perl-interpreter
- pigz
- plymouth
- prefixdevname
- python3-pyatspi
- rdma-core
- rng-tools
- rpcbind
- rpm-ostree
- rsync
- rsyslog
- selinux-policy-targeted
- sg3_utils
- sil-padauk-fonts
- smartmontools
- spice-vdagent
- strace
- systemd
- tar
- udisks2
- udisks2-iscsi
- usbutils
- vim-minimal
- volume_key
- wget
- xfsdump
- xfsprogs
- xrdb
- xz

gce:
# this image type is set to `gcp` in image-builder-crc
# & `osbuild-composer`, so set the alias here
Expand Down
Loading
Loading