From 81308749f70d6c40c6b0fea39ffe767bfe50da38 Mon Sep 17 00:00:00 2001

From: bpopovschi <zyqsempai@mail.ru>

Date: Wed, 6 Nov 2019 18:20:42 +0200

Subject: [PATCH] Added possibility to overwrite default tmp dir for big files

Signed-off-by: bpopovschi <zyqsempai@mail.ru>

---

 docker/archive/src.go        |  5 +++--

 docker/archive/transport.go  |  4 ++--

 docker/daemon/daemon_src.go  |  2 +-

 docker/tarfile/dest.go       |  5 ++++-

 docker/tarfile/src.go        | 20 ++++++++++++++++++--

 internal/tmpdir/tmpdir.go    |  7 ++++++-

 oci/archive/oci_dest.go      |  2 +-

 oci/archive/oci_src.go       |  4 ++--

 oci/archive/oci_transport.go |  9 +++++----

 storage/storage_image.go     |  4 ++--

 storage/storage_reference.go |  2 +-

 types/types.go               |  3 ++-

 12 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/docker/archive/src.go b/docker/archive/src.go

index a90707437..6a628508d 100644

--- a/vendor/github.com/containers/image/v5/docker/archive/src.go

+++ b/vendor/github.com/containers/image/v5/docker/archive/src.go

@@ -2,6 +2,7 @@ package archive

 import (

 	"context"

+

 	"github.com/containers/image/v5/docker/tarfile"

 	"github.com/containers/image/v5/types"

 	"github.com/sirupsen/logrus"

@@ -14,11 +15,11 @@ type archiveImageSource struct {

 // newImageSource returns a types.ImageSource for the specified image reference.

 // The caller must call .Close() on the returned ImageSource.

-func newImageSource(ctx context.Context, ref archiveReference) (types.ImageSource, error) {

+func newImageSource(ctx context.Context, sys *types.SystemContext, ref archiveReference) (types.ImageSource, error) {

 	if ref.destinationRef != nil {

 		logrus.Warnf("docker-archive: references are not supported for sources (ignoring)")

 	}

-	src, err := tarfile.NewSourceFromFile(ref.path)

+	src, err := tarfile.NewSourceFromFileWithContext(sys, ref.path)

 	if err != nil {

 		return nil, err

 	}

diff --git a/docker/archive/transport.go b/docker/archive/transport.go

index 44213bb8d..46c01891f 100644

--- a/vendor/github.com/containers/image/v5/docker/archive/transport.go

+++ b/vendor/github.com/containers/image/v5/docker/archive/transport.go

@@ -134,7 +134,7 @@ func (ref archiveReference) PolicyConfigurationNamespaces() []string {

 // verify that UnparsedImage, and convert it into a real Image via image.FromUnparsedImage.

 // WARNING: This may not do the right thing for a manifest list, see image.FromSource for details.

 func (ref archiveReference) NewImage(ctx context.Context, sys *types.SystemContext) (types.ImageCloser, error) {

-	src, err := newImageSource(ctx, ref)

+	src, err := newImageSource(ctx, sys, ref)

 	if err != nil {

 		return nil, err

 	}

@@ -144,7 +144,7 @@ func (ref archiveReference) NewImage(ctx context.Context, sys *types.SystemConte

 // NewImageSource returns a types.ImageSource for this reference.

 // The caller must call .Close() on the returned ImageSource.

 func (ref archiveReference) NewImageSource(ctx context.Context, sys *types.SystemContext) (types.ImageSource, error) {

-	return newImageSource(ctx, ref)

+	return newImageSource(ctx, sys, ref)

 }

 // NewImageDestination returns a types.ImageDestination for this reference.

diff --git a/docker/daemon/daemon_src.go b/docker/daemon/daemon_src.go

index 46fbcc4e0..2bca16866 100644

--- a/vendor/github.com/containers/image/v5/docker/daemon/daemon_src.go

+++ b/vendor/github.com/containers/image/v5/docker/daemon/daemon_src.go

@@ -40,7 +40,7 @@ func newImageSource(ctx context.Context, sys *types.SystemContext, ref daemonRef

 	}

 	defer inputStream.Close()

-	src, err := tarfile.NewSourceFromStream(inputStream)

+	src, err := tarfile.NewSourceFromStreamWithSystemContext(sys, inputStream)

 	if err != nil {

 		return nil, err

 	}

diff --git a/docker/tarfile/dest.go b/docker/tarfile/dest.go

index b02c60bb3..7b2f0e418 100644

--- a/vendor/github.com/containers/image/v5/docker/tarfile/dest.go

+++ b/vendor/github.com/containers/image/v5/docker/tarfile/dest.go

@@ -29,6 +29,7 @@ type Destination struct {

 	// Other state.

 	blobs  map[digest.Digest]types.BlobInfo // list of already-sent blobs

 	config []byte

+	sysCtx *types.SystemContext

 }

 // NewDestination returns a tarfile.Destination for the specified io.Writer.

@@ -94,12 +95,14 @@ func (d *Destination) HasThreadSafePutBlob() bool {

 // WARNING: The contents of stream are being verified on the fly.  Until stream.Read() returns io.EOF, the contents of the data SHOULD NOT be available

 // to any other readers for download using the supplied digest.

 // If stream.Read() at any time, ESPECIALLY at end of input, returns an error, PutBlob MUST 1) fail, and 2) delete any data stored so far.

+// Deprecated: Please use PutBlobWithSystemContext which will allows you to configure temp directory

+// for big files through SystemContext.BigFilesTemporaryDir

 func (d *Destination) PutBlob(ctx context.Context, stream io.Reader, inputInfo types.BlobInfo, cache types.BlobInfoCache, isConfig bool) (types.BlobInfo, error) {

 	// Ouch, we need to stream the blob into a temporary file just to determine the size.

 	// When the layer is decompressed, we also have to generate the digest on uncompressed datas.

 	if inputInfo.Size == -1 || inputInfo.Digest.String() == "" {

 		logrus.Debugf("docker tarfile: input with unknown size, streaming to disk first ...")

-		streamCopy, err := ioutil.TempFile(tmpdir.TemporaryDirectoryForBigFiles(), "docker-tarfile-blob")

+		streamCopy, err := ioutil.TempFile(tmpdir.TemporaryDirectoryForBigFiles(d.sysCtx), "docker-tarfile-blob")

 		if err != nil {

 			return types.BlobInfo{}, err

 		}

diff --git a/docker/tarfile/src.go b/docker/tarfile/src.go

index ad0a3d2cb..3ea5ce053 100644

--- a/vendor/github.com/containers/image/v5/docker/tarfile/src.go

+++ b/vendor/github.com/containers/image/v5/docker/tarfile/src.go

@@ -46,7 +46,14 @@ type layerInfo struct {

 // 	To do for both the NewSourceFromFile and NewSourceFromStream functions

 // NewSourceFromFile returns a tarfile.Source for the specified path.

+// Deprecated: Please use NewSourceFromFileWithContext which will allows you to configure temp directory

+// for big files through SystemContext.BigFilesTemporaryDir

 func NewSourceFromFile(path string) (*Source, error) {

+	return NewSourceFromFileWithContext(nil, path)

+}

+

+// NewSourceFromFileWithContext returns a tarfile.Source for the specified path.

+func NewSourceFromFileWithContext(sys *types.SystemContext, path string) (*Source, error) {

 	file, err := os.Open(path)

 	if err != nil {

 		return nil, errors.Wrapf(err, "error opening file %q", path)

@@ -65,16 +72,25 @@ func NewSourceFromFile(path string) (*Source, error) {

 			tarPath: path,

 		}, nil

 	}

-	return NewSourceFromStream(stream)

+	return NewSourceFromStreamWithSystemContext(sys, stream)

 }

 // NewSourceFromStream returns a tarfile.Source for the specified inputStream,

 // which can be either compressed or uncompressed. The caller can close the

 // inputStream immediately after NewSourceFromFile returns.

+// Deprecated: Please use NewSourceFromStreamWithSystemContext which will allows you to configure

+// temp directory for big files through SystemContext.BigFilesTemporaryDir

 func NewSourceFromStream(inputStream io.Reader) (*Source, error) {

+	return NewSourceFromStreamWithSystemContext(nil, inputStream)

+}

+

+// NewSourceFromStreamWithSystemContext returns a tarfile.Source for the specified inputStream,

+// which can be either compressed or uncompressed. The caller can close the

+// inputStream immediately after NewSourceFromFile returns.

+func NewSourceFromStreamWithSystemContext(sys *types.SystemContext, inputStream io.Reader) (*Source, error) {

 	// FIXME: use SystemContext here.

 	// Save inputStream to a temporary file

-	tarCopyFile, err := ioutil.TempFile(tmpdir.TemporaryDirectoryForBigFiles(), "docker-tar")

+	tarCopyFile, err := ioutil.TempFile(tmpdir.TemporaryDirectoryForBigFiles(sys), "docker-tar")

 	if err != nil {

 		return nil, errors.Wrap(err, "error creating temporary file")

 	}

diff --git a/internal/tmpdir/tmpdir.go b/internal/tmpdir/tmpdir.go

index 8c776929c..a3081f4f2 100644

--- a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go

+++ b/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go

@@ -3,6 +3,8 @@ package tmpdir

 import (

 	"os"

 	"runtime"

+

+	"github.com/containers/image/v5/types"

 )

 // unixTempDirForBigFiles is the directory path to store big files on non Windows systems.

@@ -18,7 +20,10 @@ const builtinUnixTempDirForBigFiles = "/var/tmp"

 // TemporaryDirectoryForBigFiles returns a directory for temporary (big) files.

 // On non Windows systems it avoids the use of os.TempDir(), because the default temporary directory usually falls under /tmp

 // which on systemd based systems could be the unsuitable tmpfs filesystem.

-func TemporaryDirectoryForBigFiles() string {

+func TemporaryDirectoryForBigFiles(sys *types.SystemContext) string {

+	if sys != nil && sys.BigFilesTemporaryDir != "" {

+		return sys.BigFilesTemporaryDir

+	}

 	var temporaryDirectoryForBigFiles string

 	if runtime.GOOS == "windows" {

 		temporaryDirectoryForBigFiles = os.TempDir()

diff --git a/oci/archive/oci_dest.go b/oci/archive/oci_dest.go

index 164d5522d..6918f7fb0 100644

--- a/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go

+++ b/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go

@@ -19,7 +19,7 @@ type ociArchiveImageDestination struct {

 // newImageDestination returns an ImageDestination for writing to an existing directory.

 func newImageDestination(ctx context.Context, sys *types.SystemContext, ref ociArchiveReference) (types.ImageDestination, error) {

-	tempDirRef, err := createOCIRef(ref.image)

+	tempDirRef, err := createOCIRef(sys, ref.image)

 	if err != nil {

 		return nil, errors.Wrapf(err, "error creating oci reference")

 	}

diff --git a/oci/archive/oci_src.go b/oci/archive/oci_src.go

index 33a41d44b..363c12b0b 100644

--- a/vendor/github.com/containers/image/v5/oci/archive/oci_src.go

+++ b/vendor/github.com/containers/image/v5/oci/archive/oci_src.go

@@ -20,7 +20,7 @@ type ociArchiveImageSource struct {

 // newImageSource returns an ImageSource for reading from an existing directory.

 // newImageSource untars the file and saves it in a temp directory

 func newImageSource(ctx context.Context, sys *types.SystemContext, ref ociArchiveReference) (types.ImageSource, error) {

-	tempDirRef, err := createUntarTempDir(ref)

+	tempDirRef, err := createUntarTempDir(sys, ref)

 	if err != nil {

 		return nil, errors.Wrap(err, "error creating temp directory")

 	}

@@ -43,7 +43,7 @@ func LoadManifestDescriptor(imgRef types.ImageReference) (imgspecv1.Descriptor,

 	if !ok {

 		return imgspecv1.Descriptor{}, errors.Errorf("error typecasting, need type ociArchiveReference")

 	}

-	tempDirRef, err := createUntarTempDir(ociArchRef)

+	tempDirRef, err := createUntarTempDir(nil, ociArchRef)

 	if err != nil {

 		return imgspecv1.Descriptor{}, errors.Wrap(err, "error creating temp directory")

 	}

diff --git a/oci/archive/oci_transport.go b/oci/archive/oci_transport.go

index 2d72a6fee..b7780abde 100644

--- a/vendor/github.com/containers/image/v5/oci/archive/oci_transport.go

+++ b/vendor/github.com/containers/image/v5/oci/archive/oci_transport.go

@@ -159,8 +159,9 @@ func (t *tempDirOCIRef) deleteTempDir() error {

 }

 // createOCIRef creates the oci reference of the image

-func createOCIRef(image string) (tempDirOCIRef, error) {

-	dir, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(), "oci")

+// If SystemContext.BigFilesTemporaryDir not "", overrides the temporary directory to use for storing big files

+func createOCIRef(sys *types.SystemContext, image string) (tempDirOCIRef, error) {

+	dir, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(sys), "oci")

 	if err != nil {

 		return tempDirOCIRef{}, errors.Wrapf(err, "error creating temp directory")

 	}

@@ -174,8 +175,8 @@ func createOCIRef(image string) (tempDirOCIRef, error) {

 }

 // creates the temporary directory and copies the tarred content to it

-func createUntarTempDir(ref ociArchiveReference) (tempDirOCIRef, error) {

-	tempDirRef, err := createOCIRef(ref.image)

+func createUntarTempDir(sys *types.SystemContext, ref ociArchiveReference) (tempDirOCIRef, error) {

+	tempDirRef, err := createOCIRef(sys, ref.image)

 	if err != nil {

 		return tempDirOCIRef{}, errors.Wrap(err, "error creating oci reference")

 	}

diff --git a/storage/storage_image.go b/storage/storage_image.go

index 2b89f329f..409619b21 100644

--- a/vendor/github.com/containers/image/v5/storage/storage_image.go

+++ b/vendor/github.com/containers/image/v5/storage/storage_image.go

@@ -341,8 +341,8 @@ func (s *storageImageSource) GetSignatures(ctx context.Context, instanceDigest *

 // newImageDestination sets us up to write a new image, caching blobs in a temporary directory until

 // it's time to Commit() the image

-func newImageDestination(imageRef storageReference) (*storageImageDestination, error) {

-	directory, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(), "storage")

+func newImageDestination(sys *types.SystemContext, imageRef storageReference) (*storageImageDestination, error) {

+	directory, err := ioutil.TempDir(tmpdir.TemporaryDirectoryForBigFiles(sys), "storage")

 	if err != nil {

 		return nil, errors.Wrapf(err, "error creating a temporary directory")

 	}

diff --git a/storage/storage_reference.go b/storage/storage_reference.go

index 4e137ad1b..9eb0ae738 100644

--- a/vendor/github.com/containers/image/v5/storage/storage_reference.go

+++ b/vendor/github.com/containers/image/v5/storage/storage_reference.go

@@ -295,5 +295,5 @@ func (s storageReference) NewImageSource(ctx context.Context, sys *types.SystemC

 }

 func (s storageReference) NewImageDestination(ctx context.Context, sys *types.SystemContext) (types.ImageDestination, error) {

-	return newImageDestination(s)

+	return newImageDestination(sys, s)

 }

diff --git a/types/types.go b/types/types.go

index aaeb97da6..13a8ef78d 100644

--- a/vendor/github.com/containers/image/v5/types/types.go

+++ b/vendor/github.com/containers/image/v5/types/types.go

@@ -490,9 +490,10 @@ type SystemContext struct {

 	OSChoice string

 	// If not "", overrides the system's default directory containing a blob info cache.

 	BlobInfoCacheDir string

-

 	// Additional tags when creating or copying a docker-archive.

 	DockerArchiveAdditionalTags []reference.NamedTagged

+	// If not "", overrides the temporary directory to use for storing big files

+	BigFilesTemporaryDir string

 	// === OCI.Transport overrides ===

 	// If not "", a directory containing a CA certificate (ending with ".crt"),

From b65de0f71c33ae1d3558132261f159e321c8edf1 Mon Sep 17 00:00:00 2001

From: Matthew Heon <mheon@redhat.com>

Date: Mon, 17 Aug 2020 09:24:41 -0400

Subject: [PATCH] Add support for setting the large files tmpdir to v1.6

This is based on 2c328f94b61116bfa7d1d46525d854678f94c9f3 by Les

Aker, and e53fc16b9f470a137abf182b0561a16447bfd5b7 by Dan Walsh

(the latter from containers/buildah). They have been merge here

to allow this to compile on the older v1.6 branch of Podman.

Unfortunately this does not fix Buildah, as the Buildah patches

are too new to apply on top of this old branch.

Signed-off-by: Matthew Heon <mheon@redhat.com>

---

 libpod/image/docker_registry_options.go | 11 ++++++++++-

 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go

index 62a4af4653..b1eb31e2db 100644

--- a/libpod/image/docker_registry_options.go

+++ b/libpod/image/docker_registry_options.go

@@ -2,10 +2,10 @@ package image

 import (

 	"fmt"

+	"os"

 	"github.com/containers/image/v5/docker/reference"

 	"github.com/containers/image/v5/types"

-

 	podmanVersion "github.com/containers/libpod/version"

 )

@@ -41,6 +41,7 @@ func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, add

 		DockerArchiveAdditionalTags: additionalDockerArchiveTags,

 		OSChoice:                    o.OSChoice,

 		ArchitectureChoice:          o.ArchitectureChoice,

+		BigFilesTemporaryDir:        GetTempDir(),

 	}

 	if parent != nil {

 		sc.SignaturePolicyPath = parent.SignaturePolicyPath

@@ -65,3 +66,11 @@ func GetSystemContext(signaturePolicyPath, authFilePath string, forceCompress bo

 	return sc

 }

+

+// Retrieve the temporary directory for storing large files.

+func GetTempDir() string {

+	if tmpdir, ok := os.LookupEnv("TMPDIR"); ok {

+		return tmpdir

+	}

+	return "/var/tmp"

+}