From 4c456ba8249cc6291ef0fc0dafaed80c5554d899 Mon Sep 17 00:00:00 2001 From: Nikolay Zykov Date: Mon, 24 Feb 2025 17:46:06 +0300 Subject: [PATCH] [mirror] Add mirror pull/push --tmp-dir flag (#93) * d8 mirror pull/push --tmp-dir flag Signed-off-by: borg-z Signed-off-by: borg-z Signed-off-by: Maxim Vasilenko <5184586+mvasl@users.noreply.github.com> Co-authored-by: Maxim Vasilenko <5184586+mvasl@users.noreply.github.com> --- internal/mirror/cmd/pull/flags.go | 7 +++++++ internal/mirror/cmd/pull/pull.go | 4 ++-- internal/mirror/cmd/push/flags.go | 7 +++++++ internal/mirror/cmd/push/push.go | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/internal/mirror/cmd/pull/flags.go b/internal/mirror/cmd/pull/flags.go index 72b3b16a..e6f427a5 100644 --- a/internal/mirror/cmd/pull/flags.go +++ b/internal/mirror/cmd/pull/flags.go @@ -18,6 +18,7 @@ package pull import ( "os" + "path/filepath" "github.com/spf13/pflag" ) @@ -142,4 +143,10 @@ func addFlags(flagSet *pflag.FlagSet) { false, "Interact with registries over HTTP.", ) + flagSet.StringVar( + &TempDir, + "tmp-dir", + filepath.Join(os.TempDir(), "mirror"), + "Temporary directory to use for image pulling", + ) } diff --git a/internal/mirror/cmd/pull/pull.go b/internal/mirror/cmd/pull/pull.go index 583229b7..6e46c869 100644 --- a/internal/mirror/cmd/pull/pull.go +++ b/internal/mirror/cmd/pull/pull.go @@ -47,7 +47,7 @@ var ErrPullFailed = errors.New("pull failed, see the log for details") // CLI Parameters var ( - TempDir = filepath.Join(os.TempDir(), "mirror") + TempDir string Insecure bool TLSSkipVerify bool @@ -204,7 +204,7 @@ func pull(cmd *cobra.Command, _ []string) error { if err = os.WriteFile( filepath.Join(pullParams.BundleDir, bundlePackage.Name())+".gostsum", []byte(digest), - 0644, + 0o644, ); err != nil { merr = multierror.Append(merr, fmt.Errorf("Could not write digest to .gostsum file: %w", err)) } diff --git a/internal/mirror/cmd/push/flags.go b/internal/mirror/cmd/push/flags.go index 58eade30..36e26dcc 100644 --- a/internal/mirror/cmd/push/flags.go +++ b/internal/mirror/cmd/push/flags.go @@ -18,6 +18,7 @@ package push import ( "os" + "path/filepath" "github.com/spf13/pflag" ) @@ -49,4 +50,10 @@ func addFlags(flagSet *pflag.FlagSet) { false, "Interact with registries over HTTP.", ) + flagSet.StringVar( + &TempDir, + "tmp-dir", + filepath.Join(os.TempDir(), "mirror"), + "Temporary directory to use for image pushing", + ) } diff --git a/internal/mirror/cmd/push/push.go b/internal/mirror/cmd/push/push.go index ddbc9498..cefc565a 100644 --- a/internal/mirror/cmd/push/push.go +++ b/internal/mirror/cmd/push/push.go @@ -42,7 +42,7 @@ import ( // CLI Parameters var ( - TempDir = filepath.Join(os.TempDir(), "mirror") + TempDir string RegistryHost string RegistryPath string