diff --git a/copier/syscall_unix.go b/copier/syscall_unix.go index 30356caa2c4..f03503b32fa 100644 --- a/copier/syscall_unix.go +++ b/copier/syscall_unix.go @@ -77,12 +77,12 @@ func sameDevice(a, b os.FileInfo) bool { if aSys == nil || bSys == nil { return true } - au, aok := aSys.(*syscall.Stat_t) - bu, bok := bSys.(*syscall.Stat_t) - if !aok || !bok { + uA, okA := aSys.(*syscall.Stat_t) + uB, okB := bSys.(*syscall.Stat_t) + if !okA || !okB { return true } - return au.Dev == bu.Dev + return uA.Dev == uB.Dev } const ( diff --git a/docs/buildah-build.1.md b/docs/buildah-build.1.md index 15b89b439e8..6fe68e7ed40 100644 --- a/docs/buildah-build.1.md +++ b/docs/buildah-build.1.md @@ -909,7 +909,7 @@ Pass secret information to be used in the Containerfile for building images in a safe way that will not end up stored in the final image, or be seen in other stages. The value of the secret will be read from an environment variable or file named by the "id" option, or named by the "src" option if it is specified, or from an -environment variable specifed by the "env" option. +environment variable specified by the "env" option. The secret will be mounted in the container at `/run/secrets/*id*` by default. To later use the secret, use the --mount flag in a `RUN` instruction within a `Containerfile`: diff --git a/pkg/parse/parse_test.go b/pkg/parse/parse_test.go index 6cbb3afba2c..aeb842f7b2c 100644 --- a/pkg/parse/parse_test.go +++ b/pkg/parse/parse_test.go @@ -205,7 +205,7 @@ func TestParsePullPolicy(t *testing.T) { "newer": true, "false": true, "never": true, - "trye": false, + "try": false, "truth": false, } for value, result := range testCases { diff --git a/tests/source.bats b/tests/source.bats index 20c669b7565..6d120578387 100644 --- a/tests/source.bats +++ b/tests/source.bats @@ -39,7 +39,6 @@ load helpers # Inspect the config run jq -r .created $srcdir/blobs/sha256/$configDigest assert "$status" -eq 0 "status of jq .created on configDigest" - creatd=$output run date --date="$output" assert "$status" -eq 0 "status of date (this should never ever fail)" run jq -r .author $srcdir/blobs/sha256/$configDigest