mirror of
https://github.com/containers/podman.git
synced 2025-12-04 04:09:40 +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/timezone/timezone.go
generated
vendored
3
vendor/github.com/containers/common/pkg/timezone/timezone.go
generated
vendored
@@ -10,6 +10,7 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
securejoin "github.com/cyphar/filepath-securejoin"
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/sys/unix"
|
||||
@@ -54,7 +55,7 @@ func ConfigureContainerTimeZone(timezone, containerRunDir, mountPoint, etcPath,
|
||||
}
|
||||
|
||||
var localtimePath string
|
||||
if _, err := os.Stat(hostPath); err != nil {
|
||||
if err := fileutils.Exists(hostPath); err != nil {
|
||||
// File does not exist, which means tzdata is not installed in the container.
|
||||
// Create /etc/localtime as a copy from the host.
|
||||
logrus.Debugf("Timezone %s does not exist in the container, create our own copy from the host", timezonePath)
|
||||
|
||||
Reference in New Issue
Block a user