Add Context Directory to tar

[cdoern]

podman build fails on remote build when using a relative context directory.
This is because the context dir was not being added to the tar, so when remote
the compat build function would not be able to stat the contextDir.

resolves #13293

Signed-off-by: cdoern [email protected]

[cdoern]

@Luap99 i think that this:

podman/pkg/bindings/images/build.go

Lines 565 to 567 in b1d37a7

	if path == s {
	return nil // skip root dir
	}

might be the issue. These lines are skipping the context dir when adding things to the tar

could also be this (seems like we use the compat function for the libpod endpoint) we are checking whether the containerfile is in the context dir:

podman/pkg/api/handlers/compat/images_build.go

Lines 174 to 183 in ecd2746

	containerFiles = []string{filepath.Join(contextDirectory, "Dockerfile")}
	if utils.IsLibpodRequest(r) {
	containerFiles = []string{filepath.Join(contextDirectory, "Containerfile")}
	if _, err = os.Stat(containerFiles[0]); err != nil {
	containerFiles = []string{filepath.Join(contextDirectory, "Dockerfile")}
	if _, err1 := os.Stat(containerFiles[0]); err1 != nil {
	utils.BadRequest(w, "dockerfile", query.Dockerfile, err)
	}
	}
	}

[cdoern]

@containers/podman-maintainers PTAL. I have tested this on two remote machine and made sure the server does not already have the context directory, and this works properly.

[Luap99]

Please change your commit message/PR description to reflect the current change.

[cdoern]

seems like I am including too much now in the tar, I will need to add a line back into just include context dir and containerfile not the root directories.

[cdoern]

@containers/podman-maintainers PTAL

[mheon]

LGTM with two nits, you can fix them if you need to repush, but they're not a big deal

[cdoern]

@mheon I do not think I need to re-push. Should I just leave those as is?

[mheon]

Sure, unless someone else adds comments before merge

[rhatdan]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cdoern, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[Romain-Geissler-1A]

Hi,

Thanks for this pull request ! ;)

Would it be possible to ask for a backport in branch 4.0 when it will be opened again ?

Cheers,
Romain