diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2021-09-27 09:23:04 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-09-29 16:39:29 -0400 |
| commit | 7bfc5250d82e540757e205b81d8d68d79875ee2d (patch) | |
| tree | 2a62ad40104dd1ae3a87ba4f049d83aee1751c86 | |
| parent | 7395459c761a1bc03448d2c81a887014d04da9d1 (diff) | |
| download | podman-7bfc5250d82e540757e205b81d8d68d79875ee2d.tar.gz podman-7bfc5250d82e540757e205b81d8d68d79875ee2d.tar.bz2 podman-7bfc5250d82e540757e205b81d8d68d79875ee2d.zip | |
remote build: EvalSymlinks() the context directory
Use EvalSymlinks() to find the context directory, in case there's
shenanigans.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| -rw-r--r-- | pkg/bindings/images/build.go | 3 | ||||
| -rw-r--r-- | test/system/070-build.bats | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 9d5aad23b..4d667d90a 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -230,6 +230,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO params.Add("platform", platform) } } + if contextDir, err := filepath.EvalSymlinks(options.ContextDirectory); err == nil { + options.ContextDirectory = contextDir + } params.Set("pullpolicy", options.PullPolicy.String()) diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 0e1396fc6..3faa260e1 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -956,6 +956,15 @@ EOF run_podman build -t build_test $tmpdir } +@test "podman build build context is a symlink to a directory" { + tmpdir=$PODMAN_TMPDIR/build-test + mkdir -p $tmpdir/target + ln -s target $tmpdir/link + echo FROM alpine > $tmpdir/link/Dockerfile + echo RUN echo hello >> $tmpdir/link/Dockerfile + run_podman build -t build_test $tmpdir/link +} + function teardown() { # A timeout or other error in 'build' can leave behind stale images # that podman can't even see and which will cascade into subsequent |