particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/yum: only write known options to repo file

Browse source 
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.
This commit is contained in:
Lars Karlitski 2019-09-24 15:53:31 +02:00 • committed by Tom Gundersen
parent 0dd939b658
commit e23b5a32a2
3 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
samples/base-from-yum.json
View file

@ -10,9 +10,8 @@
"basearch": "x86_64",
"repos": {
"fedora": {
"name": "Fedora",
"baseurl": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/",
"gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch"
"gpgkey": "860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4"
}
},
"packages": [

3
samples/build-from-yum.json
View file

@ -8,9 +8,8 @@
"basearch": "x86_64",
"repos": {
"fedora": {
"name": "Fedora",
"baseurl": "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/",
"gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch"
"gpgkey": "860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4"
}
},
"packages": [