diff --git a/common/go.mod b/common/go.mod index 9fafbabd7c..fc2afcfee5 100644 --- a/common/go.mod +++ b/common/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/BurntSushi/toml v0.3.1 github.com/containers/image/v5 v5.5.2 - github.com/containers/storage v1.23.1 + github.com/containers/storage v1.23.2 github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v1.4.2-0.20191219165747-a9416c67da9f github.com/docker/go-units v0.4.0 diff --git a/common/go.sum b/common/go.sum index 988fbffb00..9bd8d0f2c9 100644 --- a/common/go.sum +++ b/common/go.sum @@ -39,8 +39,8 @@ github.com/containers/ocicrypt v1.0.2 h1:Q0/IPs8ohfbXNxEfyJ2pFVmvJu5BhqJUAmc6ES9 github.com/containers/ocicrypt v1.0.2/go.mod h1:nsOhbP19flrX6rE7ieGFvBlr7modwmNjsqWarIUce4M= github.com/containers/storage v1.20.2 h1:tw/uKRPDnmVrluIzer3dawTFG/bTJLP8IEUyHFhltYk= github.com/containers/storage v1.20.2/go.mod h1:oOB9Ie8OVPojvoaKWEGSEtHbXUAs+tSyr7RO7ZGteMc= -github.com/containers/storage v1.23.1 h1:jpSGOf42efkYSm8xFpVdgGHCyJZjM18enM5i/4xGXww= -github.com/containers/storage v1.23.1/go.mod h1:5wZPDmvI3Yl8qCbqxC7Cw9CSTFBBXQbVx/VCb1Si1ck= +github.com/containers/storage v1.23.2 h1:GPZ8PXYezML1gmZ/uFaXQpyps7AH645lmdvvOJwJYNc= +github.com/containers/storage v1.23.2/go.mod h1:AyTMMiE5ANvZJiqvatQgSZ85wAl5yHucY3NDN/kemr4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= diff --git a/common/vendor/github.com/containers/storage/.cirrus.yml b/common/vendor/github.com/containers/storage/.cirrus.yml index fe611f0851..6ba46ebbb6 100644 --- a/common/vendor/github.com/containers/storage/.cirrus.yml +++ b/common/vendor/github.com/containers/storage/.cirrus.yml @@ -106,7 +106,7 @@ lint_task: env: CIRRUS_WORKING_DIR: "/go/src/github.com/containers/storage" container: - image: golang:1.13 + image: golang:1.15 modules_cache: fingerprint_script: cat go.sum folder: $GOPATH/pkg/mod @@ -142,7 +142,7 @@ meta_task: vendor_task: container: - image: golang:1.14 + image: golang:1.15 modules_cache: fingerprint_script: cat go.sum folder: $GOPATH/pkg/mod @@ -157,6 +157,6 @@ success_task: - meta - vendor container: - image: golang:1.14 + image: golang:1.15 clone_script: 'mkdir -p "$CIRRUS_WORKING_DIR"' # Source code not needed script: /bin/true diff --git a/common/vendor/github.com/containers/storage/VERSION b/common/vendor/github.com/containers/storage/VERSION index 49e0a31d49..14bee92c9e 100644 --- a/common/vendor/github.com/containers/storage/VERSION +++ b/common/vendor/github.com/containers/storage/VERSION @@ -1 +1 @@ -1.23.1 +1.23.2 diff --git a/common/vendor/github.com/containers/storage/drivers/counter.go b/common/vendor/github.com/containers/storage/drivers/counter.go index 72551a38d4..3fc45495b2 100644 --- a/common/vendor/github.com/containers/storage/drivers/counter.go +++ b/common/vendor/github.com/containers/storage/drivers/counter.go @@ -51,6 +51,10 @@ func (c *RefCounter) incdec(path string, infoOp func(minfo *minfo)) int { if c.checker.IsMounted(path) { m.count++ } + } else if !c.checker.IsMounted(path) { + // if the unmount was performed outside of this process (e.g. conmon cleanup) + //the ref counter would lose track of it. Check if it is still mounted. + m.count = 0 } infoOp(m) count := m.count diff --git a/common/vendor/github.com/containers/storage/go.mod b/common/vendor/github.com/containers/storage/go.mod index 0569b4ae03..77eef7598e 100644 --- a/common/vendor/github.com/containers/storage/go.mod +++ b/common/vendor/github.com/containers/storage/go.mod @@ -1,3 +1,5 @@ +go 1.15 + module github.com/containers/storage require ( @@ -25,5 +27,3 @@ require ( golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 gotest.tools v2.2.0+incompatible ) - -go 1.13 diff --git a/common/vendor/modules.txt b/common/vendor/modules.txt index 3d930469b5..90ca4bbe6a 100644 --- a/common/vendor/modules.txt +++ b/common/vendor/modules.txt @@ -55,7 +55,7 @@ github.com/containers/image/v5/types github.com/containers/libtrust # github.com/containers/ocicrypt v1.0.2 github.com/containers/ocicrypt/spec -# github.com/containers/storage v1.23.1 +# github.com/containers/storage v1.23.2 ## explicit github.com/containers/storage github.com/containers/storage/drivers