jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

fix: b

Browse Source
This commit is contained in:
Philip Germanov
2025-02-27 16:31:37 +02:00
parent abac253b3f
commit b0a8582955
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/buildahExecute.go
View File

@@ -161,30 +161,30 @@ func runBuildahExecute(config *buildahExecuteOptions, telemetryData *telemetry.C
log.Entry().Infof("Executing buildah command: buildah %v", displayCmd)
err = execRunner.RunExecutable("buildah", cmdOpts...)
if err != nil {
log.Entry().Warn("Initial buildah attempt failed, trying fallback configuration...")
log.Entry().Warn("Initial buildah attempt failed, trying fallback configuration...")
// Fallback options with minimal settings
cmdOpts = []string{
"bud",
"--format=docker",
"--storage-driver=vfs",
"--isolation=oci", // Try OCI isolation instead of chroot
"--pull-never", // Avoid registry operations
"--layers=false", // Disable layer optimization
}
// Fallback options with essential settings
cmdOpts = []string{
"bud",
"--format=docker",
"--storage-driver=vfs",
"--isolation=oci", // Try OCI isolation instead of chroot
"--layers=true", // Enable layer optimization
"--pull=true", // Allow pulling images when needed
}
if config.DockerfilePath != "." && config.DockerfilePath != "" {
cmdOpts = append(cmdOpts, fmt.Sprintf("-f=%s", config.DockerfilePath))
}
if config.DockerfilePath != "." && config.DockerfilePath != "" {
cmdOpts = append(cmdOpts, fmt.Sprintf("-f=%s", config.DockerfilePath))
}
// Try with default tag
cmdOpts = append(cmdOpts, "--tag=test-image:latest")
// Try with default tag
cmdOpts = append(cmdOpts, "--tag=test-image:latest")
log.Entry().Infof("Trying fallback buildah command: buildah %v", cmdOpts)
err = execRunner.RunExecutable("buildah", cmdOpts...)
if err != nil {
return fmt.Errorf("buildah build failed with both default and fallback configurations: %w", err)
}
log.Entry().Infof("Trying fallback buildah command: buildah %v", cmdOpts)
err = execRunner.RunExecutable("buildah", cmdOpts...)
if err != nil {
return fmt.Errorf("buildah build failed with both default and fallback configurations: %w", err)
}
}
// If registry is configured, push the image