summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-21 03:50:31 -0400
committerGitHub <noreply@github.com>2021-06-21 03:50:31 -0400
commit9ec4d04592a7a7a833e4eefbe14e77af2da1f92d (patch)
treed8bbd129c48117f4954b4296f37c57f407b0f76c /vendor/github.com
parent928687e1dab6b0dd57f5673791f33a3b336830d8 (diff)
parent7864108ff191e2d78666fb5bdf098d295b7bae59 (diff)
downloadpodman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.tar.gz
podman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.tar.bz2
podman-9ec4d04592a7a7a833e4eefbe14e77af2da1f92d.zip
Merge pull request #10723 from rhatdan/tmpdir
fix systemcontext to use correct TMPDIR
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/common/libimage/download.go4
-rw-r--r--vendor/github.com/containers/common/libimage/image.go16
-rw-r--r--vendor/github.com/containers/common/libimage/runtime.go3
-rw-r--r--vendor/github.com/containers/common/version/version.go2
4 files changed, 15 insertions, 10 deletions
diff --git a/vendor/github.com/containers/common/libimage/download.go b/vendor/github.com/containers/common/libimage/download.go
index 5ea11f084..54edf1b9a 100644
--- a/vendor/github.com/containers/common/libimage/download.go
+++ b/vendor/github.com/containers/common/libimage/download.go
@@ -11,7 +11,7 @@ import (
)
// tmpdir returns a path to a temporary directory.
-func (r *Runtime) tmpdir() string {
+func tmpdir() string {
tmpdir := os.Getenv("TMPDIR")
if tmpdir == "" {
tmpdir = "/var/tmp"
@@ -25,7 +25,7 @@ func (r *Runtime) tmpdir() string {
func (r *Runtime) downloadFromURL(source string) (string, error) {
fmt.Printf("Downloading from %q\n", source)
- outFile, err := ioutil.TempFile(r.tmpdir(), "import")
+ outFile, err := ioutil.TempFile(r.systemContext.BigFilesTemporaryDir, "import")
if err != nil {
return "", errors.Wrap(err, "error creating file")
}
diff --git a/vendor/github.com/containers/common/libimage/image.go b/vendor/github.com/containers/common/libimage/image.go
index de0b4b2c5..3bcdbabec 100644
--- a/vendor/github.com/containers/common/libimage/image.go
+++ b/vendor/github.com/containers/common/libimage/image.go
@@ -329,17 +329,19 @@ func (i *Image) remove(ctx context.Context, rmMap map[string]*RemoveImageReport,
// an `rmi foo` will not untag "foo" but instead attempt to remove the
// entire image. If there's a container using "foo", we should get an
// error.
- if options.Force || referencedBy == "" || numNames == 1 {
+ if referencedBy == "" || numNames == 1 {
// DO NOTHING, the image will be removed
} else {
byID := strings.HasPrefix(i.ID(), referencedBy)
byDigest := strings.HasPrefix(referencedBy, "sha256:")
- if byID && numNames > 1 {
- return errors.Errorf("unable to delete image %q by ID with more than one tag (%s): please force removal", i.ID(), i.Names())
- } else if byDigest && numNames > 1 {
- // FIXME - Docker will remove the digest but containers storage
- // does not support that yet, so our hands are tied.
- return errors.Errorf("unable to delete image %q by digest with more than one tag (%s): please force removal", i.ID(), i.Names())
+ if !options.Force {
+ if byID && numNames > 1 {
+ return errors.Errorf("unable to delete image %q by ID with more than one tag (%s): please force removal", i.ID(), i.Names())
+ } else if byDigest && numNames > 1 {
+ // FIXME - Docker will remove the digest but containers storage
+ // does not support that yet, so our hands are tied.
+ return errors.Errorf("unable to delete image %q by digest with more than one tag (%s): please force removal", i.ID(), i.Names())
+ }
}
// Only try to untag if we know it's not an ID or digest.
diff --git a/vendor/github.com/containers/common/libimage/runtime.go b/vendor/github.com/containers/common/libimage/runtime.go
index 93a42eb55..efa182544 100644
--- a/vendor/github.com/containers/common/libimage/runtime.go
+++ b/vendor/github.com/containers/common/libimage/runtime.go
@@ -84,6 +84,9 @@ func RuntimeFromStore(store storage.Store, options *RuntimeOptions) (*Runtime, e
} else {
systemContext = types.SystemContext{}
}
+ if systemContext.BigFilesTemporaryDir == "" {
+ systemContext.BigFilesTemporaryDir = tmpdir()
+ }
setRegistriesConfPath(&systemContext)
diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go
index e8e3d72fe..6c899987a 100644
--- a/vendor/github.com/containers/common/version/version.go
+++ b/vendor/github.com/containers/common/version/version.go
@@ -1,4 +1,4 @@
package version
// Version is the version of the build.
-const Version = "0.40.0"
+const Version = "0.40.1-dev"