diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-03 13:15:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 13:15:17 -0500 |
| commit | 337f706f6118f2c91e9906afcdaa233f7cfdbaf9 (patch) | |
| tree | 46089e99e6787eac7ebfe9ec459c92d802a60206 | |
| parent | 18348c0b695d16002a199a770c0c2cf7fe89ca4b (diff) | |
| parent | 0c9a8ac073b99af1679d62cd92b3a6b05ab353f6 (diff) | |
| download | podman-337f706f6118f2c91e9906afcdaa233f7cfdbaf9.tar.gz podman-337f706f6118f2c91e9906afcdaa233f7cfdbaf9.tar.bz2 podman-337f706f6118f2c91e9906afcdaa233f7cfdbaf9.zip | |
Merge pull request #13130 from nalind/slashify-dockerfile-4.0
[v4.0] pkg/bindings/images.Build(): slashify "dockerfile" values, too
| -rw-r--r-- | pkg/bindings/images/build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index b7220f5c5..a363f2c6e 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -332,7 +332,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO } tarContent := []string{options.ContextDirectory} - newContainerFiles := []string{} + newContainerFiles := []string{} // dockerfile paths, relative to context dir, ToSlash()ed dontexcludes := []string{"!Dockerfile", "!Containerfile", "!.dockerignore", "!.containerignore"} for _, c := range containerFiles { @@ -380,7 +380,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO tarContent = append(tarContent, containerfile) } } - newContainerFiles = append(newContainerFiles, containerfile) + newContainerFiles = append(newContainerFiles, filepath.ToSlash(containerfile)) } if len(newContainerFiles) > 0 { cFileJSON, err := json.Marshal(newContainerFiles) |