containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't log EOF error when using podman --remote build with an empty context directory. 

Closes #15921.

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
This commit is contained in:
Romain Geissler 2023-07-28 20:00:53 +00:00
parent b6a52f1f8b
commit 4ee31dc37f
No known key found for this signature in database
GPG Key ID: 2530E79BC9A4BB13
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/bindings/images/build.go
View File

@ -675,9 +675,10 @@ func nTar(excludes []string, sources ...string) (io.ReadCloser, error) {
} }
defer p.Close() defer p.Close()
_, err = p.Readdir(1) _, err = p.Readdir(1)
if err != io.EOF { if err == nil {
return nil // non empty root dir, need to return return nil // non empty root dir, need to return
} else if err != nil { }
if err != io.EOF {
logrus.Errorf("While reading directory %v: %v", path, err) logrus.Errorf("While reading directory %v: %v", path, err)
} }
} }

12
test/system/070-build.bats
View File

@ -1097,6 +1097,18 @@ EOF
run_podman rmi -f build_test run_podman rmi -f build_test
} }
@test "podman build empty context dir" {
buildcontextdir=$PODMAN_TMPDIR/emptydir
mkdir -p $buildcontextdir
containerfile=$PODMAN_TMPDIR/Containerfile
echo FROM scratch >$containerfile
run_podman build -t build_test -f $containerfile $buildcontextdir
assert "$output" !~ "EOF" "output should not contain EOF error"
run_podman rmi -f build_test
}
function teardown() { function teardown() {
# A timeout or other error in 'build' can leave behind stale images # A timeout or other error in 'build' can leave behind stale images
# that podman can't even see and which will cascade into subsequent # that podman can't even see and which will cascade into subsequent