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

cmd: extra env logging for osbuild worker

Browse source
This commit is contained in:
Lukas Zapletal 2024-11-26 15:24:21 +01:00 • committed by Lukáš Zapletal
parent 1372be3f6e
commit e7a7cda3bc
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -518,6 +518,9 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
// Both curl and ostree input share the same MTLS config
if impl.RepositoryMTLSConfig != nil {
// Setting a CA cert with hosted Pulp with break the build since Pulp redirects HTTPS requests to AWS S3 which has
// a different CA which is part of OS cert bundle. Both curl and ostree commands only support either explicit CA file
// or OS cert bundle, but not both. To verify hosted Pulp CA, enroll its CA into the OS cert bundle instead.
if impl.RepositoryMTLSConfig.CA != "" {
extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_CURL_SSL_CA_CERT=%s", impl.RepositoryMTLSConfig.CA))
extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_OSTREE_SSL_CA_CERT=%s", impl.RepositoryMTLSConfig.CA))
@ -560,6 +563,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
exportPaths = append(exportPaths, path.Join(jobTarget.OsbuildArtifact.ExportName, jobTarget.OsbuildArtifact.ExportFilename))
}
logWithId.Infof("Extra env: %q", extraEnv)
opts := &osbuildexecutor.OsbuildOpts{
StoreDir: impl.Store,
OutputDir: outputDirectory,