mirror of
https://github.com/containers/podman.git
synced 2025-11-30 10:07:33 +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/buildah/internal/mkcw/attest.go
generated
vendored
3
vendor/github.com/containers/buildah/internal/mkcw/attest.go
generated
vendored
@@ -15,6 +15,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/containers/buildah/internal/mkcw/types"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@@ -224,7 +225,7 @@ func GenerateMeasurement(workloadConfig WorkloadConfig, firmwareLibrary string)
|
||||
}
|
||||
}
|
||||
for _, candidate := range pathsToCheck {
|
||||
if _, err := os.Lstat(candidate); err == nil {
|
||||
if err := fileutils.Lexists(candidate); err == nil {
|
||||
var stdout, stderr bytes.Buffer
|
||||
logrus.Debugf("krunfw_measurement -c %s -m %s %s", cpuString, memoryString, candidate)
|
||||
cmd := exec.Command("krunfw_measurement", "-c", cpuString, "-m", memoryString, candidate)
|
||||
|
||||
4
vendor/github.com/containers/buildah/internal/parse/parse.go
generated
vendored
4
vendor/github.com/containers/buildah/internal/parse/parse.go
generated
vendored
@@ -2,11 +2,11 @@ package parse
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/common/pkg/parse"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
)
|
||||
|
||||
@@ -15,7 +15,7 @@ func ValidateVolumeMountHostDir(hostDir string) error {
|
||||
if !filepath.IsAbs(hostDir) {
|
||||
return fmt.Errorf("invalid host path, must be an absolute path %q", hostDir)
|
||||
}
|
||||
if _, err := os.Stat(hostDir); err != nil {
|
||||
if err := fileutils.Exists(hostDir); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user