From cbde2647500bb6a1c8a9798f53cf663bb3f03453 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 28 May 2024 12:01:49 +0200 Subject: [PATCH 1/3] [release-5.29] blobinfocache: add function to delete the cache directory Needed for: https://github.com/containers/podman/issues/22825 Addresses: https://issues.redhat.com/browse/ACCELFIX-268 Signed-off-by: Giuseppe Scrivano Signed-off-by: tomsweeneyredhat --- pkg/blobinfocache/default.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/blobinfocache/default.go b/pkg/blobinfocache/default.go index 037572b0..b413ec51 100644 --- a/pkg/blobinfocache/default.go +++ b/pkg/blobinfocache/default.go @@ -74,3 +74,15 @@ func DefaultCache(sys *types.SystemContext) types.BlobInfoCache { logrus.Debugf("Using SQLite blob info cache at %s", path) return cache } + +// CleanupDefaultCache removes the blob info cache directory. +// It deletes the cache directory but it does not affect any file or memory buffer currently +// in use. +func CleanupDefaultCache(sys *types.SystemContext) error { + dir, err := blobInfoCacheDir(sys, rootless.GetRootlessEUID()) + if err != nil { + // Mirror the DefaultCache behavior that does not fail in this case + return nil + } + return os.RemoveAll(dir) +} From 2d62aa11894861eb40100028283bbc42d5f9bb74 Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Thu, 25 Jul 2024 16:40:24 -0400 Subject: [PATCH 2/3] [release-5.29] c/image to v5.29.5 Bump c/image as noted to create a version of c/image for Podman v4.9-rhel to address https://issues.redhat.com/browse/ACCELFIX-268 Signed-off-by: tomsweeneyredhat --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 4f0f8cac..6dc60b9f 100644 --- a/version/version.go +++ b/version/version.go @@ -11,7 +11,7 @@ const ( VersionPatch = 5 // VersionDev indicates development branch. Releases will be empty string. - VersionDev = "-dev" + VersionDev = "" ) // Version is the specification version that the package types support. From 8fbf1214d8cb9ba32027132b7fd3676ede5099c9 Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Thu, 25 Jul 2024 16:42:15 -0400 Subject: [PATCH 3/3] [release-5.29] c/image to v5.29.6-dev As the title says. Bump back to a dev version. Signed-off-by: tomsweeneyredhat --- version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version/version.go b/version/version.go index 6dc60b9f..4ad5a324 100644 --- a/version/version.go +++ b/version/version.go @@ -8,10 +8,10 @@ const ( // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 29 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 5 + VersionPatch = 6 // VersionDev indicates development branch. Releases will be empty string. - VersionDev = "" + VersionDev = "-dev" ) // Version is the specification version that the package types support.