a11e124133
This commit adds a new flag `--extra-repo` that can be used
to point to a repository url that is added to the base
repositories when depsolving. Note that *no* gpg checking
will be performed for such repos as there is no way to
add gpg-keys (yet) via this mechanism.
This means that with a repo created with e.g. `createrepo_c` like
```console
$ mkdir repo
$ (cd repo && dnf download hello)
$ createrepo_c ./repo
```
and a blueprint like:
```toml
[[packages]]
name = "hello"
```
a manifest is generated that gets hello from this local repo:
```console
$ image-builder --extra-repo file:$(pwd)/repo manifest qcow2 --distro centos-9 --blueprint ./bp.toml |jq|grep hello
"path": "hello-2.12.1-5.fc41.x86_64.rpm",
```
Note that this is part of the base repositories so anything with a
higher version number will get pulled from the extra-repo, even
system libraries or kernels. Note also that this repository does
not become part of the image so after the image build all rpms
from there are not updated (unless of course the normal repos
have higher versions of them).
Note as well that there is no safeguard right now against adding
extra repos for the wrong version of the distro, i.e. one could
add an extra repo build against/for fedora-42 on a fedora-40 image
which most likely will break with bad depsolve errors. But that
is okay, this option is meant for advanced users and testing.
89 lines
2.5 KiB
Go
89 lines
2.5 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"io/fs"
|
|
"net/url"
|
|
|
|
"github.com/osbuild/images/data/repositories"
|
|
"github.com/osbuild/images/pkg/reporegistry"
|
|
"github.com/osbuild/images/pkg/rpmmd"
|
|
)
|
|
|
|
// defaultDataDirs contains the default search paths to look for
|
|
// repository data. They contain a bunch of json files of the form
|
|
// "$distro_$version".json (but that is an implementation detail that
|
|
// the "images" library takes care of).
|
|
var defaultDataDirs = []string{
|
|
"/etc/image-builder/repositories",
|
|
"/usr/share/image-builder/repositories",
|
|
}
|
|
|
|
type repoConfig struct {
|
|
DataDir string
|
|
ExtraRepos []string
|
|
}
|
|
|
|
func parseExtraRepo(extraRepo string) ([]rpmmd.RepoConfig, error) {
|
|
// We want to eventually support more URIs repos here:
|
|
// - config:/path/to/repo.json
|
|
// - copr:@osbuild/osbuild (with full gpg retrival via the copr API)
|
|
// But for now just default to base-urls
|
|
|
|
baseURL, err := url.Parse(extraRepo)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("cannot parse extra repo %w", err)
|
|
}
|
|
if baseURL.Scheme == "" {
|
|
return nil, fmt.Errorf(`scheme missing in %q, please prefix with e.g. file:`, extraRepo)
|
|
}
|
|
|
|
// TODO: to support gpg checking we will need to add signing keys.
|
|
// We will eventually add support for our own "repo.json" format
|
|
// which is rich enough to contain gpg keys (and more).
|
|
checkGPG := false
|
|
return []rpmmd.RepoConfig{
|
|
{
|
|
Id: baseURL.String(),
|
|
Name: baseURL.String(),
|
|
BaseURLs: []string{baseURL.String()},
|
|
CheckGPG: &checkGPG,
|
|
CheckRepoGPG: &checkGPG,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
var newRepoRegistry = func(dataDir string, extraRepos []string) (*reporegistry.RepoRegistry, error) {
|
|
var dataDirs []string
|
|
if dataDir != "" {
|
|
dataDirs = []string{dataDir}
|
|
} else {
|
|
dataDirs = defaultDataDirs
|
|
}
|
|
|
|
conf, err := reporegistry.LoadAllRepositories(dataDirs, []fs.FS{repos.FS})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// XXX: this should probably go into manifestgen.Options as
|
|
// a new Options.ExtraRepoConf eventually (just like OverrideRepos)
|
|
for _, repo := range extraRepos {
|
|
// XXX: this loads the extra repo unconditionally to all
|
|
// distro/arch versions. we do not know in advance where
|
|
// it belongs to
|
|
extraRepo, err := parseExtraRepo(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, repoArchConfigs := range conf {
|
|
for arch := range repoArchConfigs {
|
|
archCfg := repoArchConfigs[arch]
|
|
archCfg = append(archCfg, extraRepo...)
|
|
repoArchConfigs[arch] = archCfg
|
|
}
|
|
}
|
|
}
|
|
|
|
return reporegistry.NewFromDistrosRepoConfigs(conf), nil
|
|
}
|