Merge pull request #12381 from flouthoc/build-layer-docker-compat

compat: add layer caching compatiblity for `non-podman` clients.
This commit is contained in:
OpenShift Merge Robot
2021-11-22 19:02:31 +01:00
committed by GitHub
2 changed files with 16 additions and 0 deletions

View File

@ -134,6 +134,15 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
return
}
// if layers field not set assume its not from a valid podman-client
// could be a docker client, set `layers=true` since that is the default
// expected behviour
if !utils.IsLibpodRequest(r) {
if _, found := r.URL.Query()["layers"]; !found {
query.Layers = true
}
}
// convert addcaps formats
var addCaps = []string{}
if _, found := r.URL.Query()["addcaps"]; found {

View File

@ -1523,6 +1523,13 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// JSON map of key, value pairs to set as labels on the new image
// (As of version 1.xx)
// - in: query
// name: layers
// type: boolean
// default: true
// description: |
// Cache intermediate layers during build.
// (As of version 1.xx)
// - in: query
// name: networkmode
// type: string
// default: bridge