go.mod: bump osbuild/images to 51
This commit is contained in:
parent
9aa80c25bc
commit
1ce72071b4
38 changed files with 507 additions and 153 deletions
8
vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go
generated
vendored
8
vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go
generated
vendored
|
|
@ -298,6 +298,9 @@ func (s *Solver) reposFromRPMMD(rpmRepos []rpmmd.RepoConfig) ([]repoConfig, erro
|
|||
MirrorList: rr.MirrorList,
|
||||
GPGKeys: rr.GPGKeys,
|
||||
MetadataExpire: rr.MetadataExpire,
|
||||
SSLCACert: rr.SSLCACert,
|
||||
SSLClientKey: rr.SSLClientKey,
|
||||
SSLClientCert: rr.SSLClientCert,
|
||||
repoHash: rr.Hash(),
|
||||
}
|
||||
if rr.ModuleHotfixes != nil {
|
||||
|
|
@ -502,8 +505,13 @@ func (pkgs packageSpecs) toRPMMD(repos map[string]rpmmd.RepoConfig) []rpmmd.Pack
|
|||
if repo.IgnoreSSL != nil {
|
||||
rpmDependencies[i].IgnoreSSL = *repo.IgnoreSSL
|
||||
}
|
||||
|
||||
// The ssl secrets will also be set if rhsm is true,
|
||||
// which should take priority.
|
||||
if repo.RHSM {
|
||||
rpmDependencies[i].Secrets = "org.osbuild.rhsm"
|
||||
} else if repo.SSLClientKey != "" {
|
||||
rpmDependencies[i].Secrets = "org.osbuild.mtls"
|
||||
}
|
||||
}
|
||||
return rpmDependencies
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue