Skip to content

Commit

Permalink
libimage.RuntimeFromStore(): stop overriding the BlobInfoCache location
Browse files Browse the repository at this point in the history
When it was first introduced, the blob info cache's location didn't
change from the system-wide default location when we were running in
rootless mode, so we started setting its location ourselves to avoid
triggering permissions errors when updating it.

The image library has since started taking into account that it was
running in rootless mode, but its hardwired default isn't the same as
the one we were setting, so we ended up creating a second cache file.

Stop doing that.

Signed-off-by: Nalin Dahyabhai <[email protected]>
  • Loading branch information
nalind committed Jul 19, 2021
1 parent e05ac5e commit f9bccd7
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions libimage/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package libimage
import (
"context"
"os"
"path/filepath"
"strings"

"github.com/containers/image/v5/docker/reference"
Expand Down Expand Up @@ -94,10 +93,6 @@ func RuntimeFromStore(store storage.Store, options *RuntimeOptions) (*Runtime, e

setRegistriesConfPath(&systemContext)

if systemContext.BlobInfoCacheDir == "" {
systemContext.BlobInfoCacheDir = filepath.Join(store.GraphRoot(), "cache")
}

return &Runtime{
store: store,
systemContext: systemContext,
Expand Down

0 comments on commit f9bccd7

Please sign in to comment.