Skip to content

Use output's parent dir for temp files in standalone convert #1907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sondavidb merged 1 commit into from
Mar 30, 2026
Merged

Use output's parent dir for temp files in standalone convert #1907

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmd/soci/commands/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"errors"
"fmt"
"os"
"path/filepath"
"slices"
"strings"

Expand Down Expand Up @@ -197,7 +198,14 @@ var ConvertCommand = &cli.Command{
func runStandaloneConvert(ctx context.Context, cmd *cli.Command, inputPath string, outputPath string) error {
format := cmd.String(outputFormatFlag)

ociLayoutDir, err := os.MkdirTemp("", "soci-oci-*")
// Prefer the OS temp dir (/tmp) since it's often memory-backed and faster.
// Fall back to the output path's parent for minimal environments (e.g., scratch images) where /tmp may not exist.
tmpBase := os.TempDir()
if _, err := os.Stat(tmpBase); err != nil {
tmpBase = filepath.Dir(filepath.Clean(outputPath))
}

ociLayoutDir, err := os.MkdirTemp(tmpBase, "soci-oci-*")
if err != nil {
return fmt.Errorf("failed to create temp directory: %w", err)
}
Expand All @@ -208,7 +216,7 @@ func runStandaloneConvert(ctx context.Context, cmd *cli.Command, inputPath strin
return err
}

artifactsDir, err := os.MkdirTemp("", "soci-artifacts-*")
artifactsDir, err := os.MkdirTemp(tmpBase, "soci-artifacts-*")
if err != nil {
return fmt.Errorf("failed to create artifacts temp directory: %w", err)
}
Expand Down