Prechádzať zdrojové kódy

api: POST /build: remove version-gate for "rm", "force-rm" (api < v1.16)

The "rm" option was made the default in API v1.12 (Docker Engine v1.0.0)
in commit b60d6471721bc914dca179a4372303d41913cc4c, and "force-rm" was
added in 667e2bd4ea5fbc8698c34565f955cb92cff92890.

API v1.23 and older are deprecated, so we can remove these gates.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 rok pred
rodič
commit
7fa116830b
1 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 3 3
      api/server/router/build/build_routes.go

+ 3 - 3
api/server/router/build/build_routes.go

@@ -66,14 +66,14 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui
 		return nil, invalidParam{errors.New("security options are not supported on " + runtime.GOOS)}
 	}
 
-	version := httputils.VersionFromContext(ctx)
-	if httputils.BoolValue(r, "forcerm") && versions.GreaterThanOrEqualTo(version, "1.12") {
+	if httputils.BoolValue(r, "forcerm") {
 		options.Remove = true
-	} else if r.FormValue("rm") == "" && versions.GreaterThanOrEqualTo(version, "1.12") {
+	} else if r.FormValue("rm") == "" {
 		options.Remove = true
 	} else {
 		options.Remove = httputils.BoolValue(r, "rm")
 	}
+	version := httputils.VersionFromContext(ctx)
 	if httputils.BoolValue(r, "pull") && versions.GreaterThanOrEqualTo(version, "1.16") {
 		options.PullParent = true
 	}