opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12092 from rhatdan/build

Browse Source 
If Dockerfile exists in same directory as service, we should not use it.
This commit is contained in:
OpenShift Merge Robot
2021-10-26 18:33:53 +00:00
committed by GitHub
parent 420ac5d13d d6296c918d
commit 22e5dc19b0
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/api/handlers/compat/images_build.go
View File

@ -151,22 +151,19 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
var m = []string{} var m = []string{}
if err := json.Unmarshal([]byte(query.Dockerfile), &m); err != nil { if err := json.Unmarshal([]byte(query.Dockerfile), &m); err != nil {
// it's not json, assume just a string // it's not json, assume just a string
m = append(m, query.Dockerfile) m = []string{filepath.Join(contextDirectory, query.Dockerfile)}
} }
containerFiles = m containerFiles = m
} else { } else {
containerFiles = []string{"Dockerfile"} containerFiles = []string{filepath.Join(contextDirectory, "Dockerfile")}
if utils.IsLibpodRequest(r) { if utils.IsLibpodRequest(r) {
containerFiles = []string{"Containerfile"} containerFiles = []string{filepath.Join(contextDirectory, "Containerfile")}
if _, err = os.Stat(filepath.Join(contextDirectory, "Containerfile")); err != nil { if _, err = os.Stat(containerFiles[0]); err != nil {
if _, err1 := os.Stat(filepath.Join(contextDirectory, "Dockerfile")); err1 == nil { containerFiles = []string{filepath.Join(contextDirectory, "Dockerfile")}
containerFiles = []string{"Dockerfile"} if _, err1 := os.Stat(containerFiles[0]); err1 != nil {
} else {
utils.BadRequest(w, "dockerfile", query.Dockerfile, err) utils.BadRequest(w, "dockerfile", query.Dockerfile, err)
} }
} }
} else {
containerFiles = []string{"Dockerfile"}
} }
} }