diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-03 04:01:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 04:01:15 -0500 |
| commit | f2263fade4aef30fd619b648e4d1ca4aaf6bd506 (patch) | |
| tree | 17139e5955378bf71035bc3d28ab5eadcd236963 | |
| parent | 89f71177aa4b00ee47245787ec5b5370a500d090 (diff) | |
| parent | 725a6f8939de5323eb3abebd80e5b2fabcb16662 (diff) | |
| download | podman-f2263fade4aef30fd619b648e4d1ca4aaf6bd506.tar.gz podman-f2263fade4aef30fd619b648e4d1ca4aaf6bd506.tar.bz2 podman-f2263fade4aef30fd619b648e4d1ca4aaf6bd506.zip | |
Merge pull request #13120 from nalind/slashify-dockerfile
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) |