summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-11-22 19:02:31 +0100
committerGitHub <noreply@github.com>2021-11-22 19:02:31 +0100
commit9133c5646c128d4516aa2f13fb6d5c2a13c0b593 (patch)
treee872103cbde6199774d32b088fe0203686948b05
parent55dbc4e198878cefb758d28ea7b3467a1be08492 (diff)
parent13ee1788f9524319c01fdd019060cca5790f2f76 (diff)
downloadpodman-9133c5646c128d4516aa2f13fb6d5c2a13c0b593.tar.gz
podman-9133c5646c128d4516aa2f13fb6d5c2a13c0b593.tar.bz2
podman-9133c5646c128d4516aa2f13fb6d5c2a13c0b593.zip
Merge pull request #12381 from flouthoc/build-layer-docker-compat
compat: add layer caching compatiblity for `non-podman` clients.
-rw-r--r--pkg/api/handlers/compat/images_build.go9
-rw-r--r--pkg/api/server/register_images.go7
2 files changed, 16 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 6152f1c02..7bbc4b99c 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -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 {
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 38ceea271..bf8eeef40 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -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