diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-27 11:12:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 11:12:57 -0400 |
| commit | 899d5d7d7c526c44e3273b31703f518863800aa0 (patch) | |
| tree | 969b413a323dcc67799788ad4fc14d1673da7365 | |
| parent | e27470ba97ae3dda32fb06b408da786f2b25a25d (diff) | |
| parent | 464fec260c509f59ecc7ca0b9b498f392f34958b (diff) | |
| download | podman-899d5d7d7c526c44e3273b31703f518863800aa0.tar.gz podman-899d5d7d7c526c44e3273b31703f518863800aa0.tar.bz2 podman-899d5d7d7c526c44e3273b31703f518863800aa0.zip | |
Merge pull request #11755 from nalind/remote-build-eval-contextdir
remote build: EvalSymlinks() the context directory
| -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 ded97d8d6..8cf4532d0 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 |