e23b5a32a2
This is similar to the previous commit for the dnf stage. Don't pass through arbitrary options. This means that pipeline repo objects don't have the same options as yum repo files anymore: 1. Hard code repo name to repo id. The name has no influence on the resulting image and should thus not appear in a pipeline. 2. Set gpgcheck=1 when gpgkey is given. It defaults to false, which means that all sample and test pipelines didn't verify packages. It would have failed anyway, because the container doesn't have the key referenced in /etc. Change all gpgkeys to refer to the key id and import them manually. 3. Don't allow lists for baseurl and gpgkey. We can add that if we need it at some point. Also be less verbose.
46 lines
1.1 KiB
JSON
46 lines
1.1 KiB
JSON
{
|
|
"name": "base",
|
|
"build": {
|
|
"name": "build",
|
|
"stages": [
|
|
{
|
|
"name": "org.osbuild.yum",
|
|
"options": {
|
|
"releasever": "27",
|
|
"basearch": "x86_64",
|
|
"repos": {
|
|
"fedora": {
|
|
"baseurl": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/",
|
|
"gpgkey": "860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4"
|
|
}
|
|
},
|
|
"packages": [
|
|
"dnf",
|
|
"systemd",
|
|
"gnupg"
|
|
]
|
|
}
|
|
}
|
|
]
|
|
},
|
|
"stages": [
|
|
{
|
|
"name": "org.osbuild.dnf",
|
|
"options": {
|
|
"releasever": "30",
|
|
"basearch": "x86_64",
|
|
"repos": {
|
|
"fedora": {
|
|
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
|
|
"gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9"
|
|
}
|
|
},
|
|
"packages": [
|
|
"@Core",
|
|
"selinux-policy-targeted",
|
|
"grub2-pc"
|
|
]
|
|
}
|
|
}
|
|
]
|
|
}
|