mirror of
https://github.com/containers/podman.git
synced 2025-12-05 04:40:47 +08:00
vendor: update containers/{buildah,common,image,storage}
The change in healthcheck_run_test.go, depends on the containers/image change: commit b6afa8ca7b324aca8fd5a7b5b206fc05c0c04874 Author: Mikhail Sokolov <msokolov@evolution.com> Date: Fri Mar 15 13:37:44 2024 +0200 Add support for Docker HealthConfig.StartInterval (v25.0.0+) Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
3
vendor/github.com/containers/common/pkg/secrets/filedriver/filedriver.go
generated
vendored
3
vendor/github.com/containers/common/pkg/secrets/filedriver/filedriver.go
generated
vendored
@@ -9,6 +9,7 @@ import (
|
||||
"path/filepath"
|
||||
"sort"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/lockfile"
|
||||
"golang.org/x/exp/maps"
|
||||
)
|
||||
@@ -128,7 +129,7 @@ func (d *Driver) Delete(id string) error {
|
||||
// getAllData reads the data file and returns all data
|
||||
func (d *Driver) getAllData() (map[string][]byte, error) {
|
||||
// check if the db file exists
|
||||
_, err := os.Stat(d.secretsDataFilePath)
|
||||
err := fileutils.Exists(d.secretsDataFilePath)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
// the file will be created later on a store()
|
||||
|
||||
4
vendor/github.com/containers/common/pkg/secrets/passdriver/passdriver.go
generated
vendored
4
vendor/github.com/containers/common/pkg/secrets/passdriver/passdriver.go
generated
vendored
@@ -11,6 +11,8 @@ import (
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -74,7 +76,7 @@ func defaultDriverConfig() *driverConfig {
|
||||
func (cfg *driverConfig) findGpgID() {
|
||||
path := cfg.Root
|
||||
for len(path) > 1 {
|
||||
if _, err := os.Stat(filepath.Join(path, ".gpg-id")); err == nil {
|
||||
if err := fileutils.Exists(filepath.Join(path, ".gpg-id")); err == nil {
|
||||
bs, err := os.ReadFile(filepath.Join(path, ".gpg-id"))
|
||||
if err != nil {
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user