mirror of
https://github.com/containers/podman.git
synced 2025-12-02 11:08:36 +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:
4
vendor/github.com/containers/buildah/common.go
generated
vendored
4
vendor/github.com/containers/buildah/common.go
generated
vendored
@@ -3,7 +3,6 @@ package buildah
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
@@ -15,6 +14,7 @@ import (
|
||||
"github.com/containers/image/v5/types"
|
||||
encconfig "github.com/containers/ocicrypt/config"
|
||||
"github.com/containers/storage"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
)
|
||||
|
||||
@@ -59,7 +59,7 @@ func getSystemContext(store storage.Store, defaults *types.SystemContext, signat
|
||||
if store != nil {
|
||||
if sc.SystemRegistriesConfPath == "" && unshare.IsRootless() {
|
||||
userRegistriesFile := filepath.Join(store.GraphRoot(), "registries.conf")
|
||||
if _, err := os.Stat(userRegistriesFile); err == nil {
|
||||
if err := fileutils.Exists(userRegistriesFile); err == nil {
|
||||
sc.SystemRegistriesConfPath = userRegistriesFile
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user