Merge pull request #9516 from rhatdan/shrink

[NO TESTS NEEDED] Shrink the size of podman bindings

2 files changed, 8 insertions, 9 deletions

diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 36785a362..fd310711f 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -13,8 +13,7 @@ import (
 	"time"
 
 	"github.com/containers/buildah"
-	"github.com/containers/buildah/define"
-	"github.com/containers/buildah/imagebuildah"
+	buildahDefine "github.com/containers/buildah/define"
 	"github.com/containers/buildah/util"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v3/libpod"
@@ -277,13 +276,13 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		jobs = query.Jobs
 	}
 
-	pullPolicy := define.PullIfMissing
+	pullPolicy := buildahDefine.PullIfMissing
 	if utils.IsLibpodRequest(r) {
-		pullPolicy = define.PolicyMap[query.PullPolicy]
+		pullPolicy = buildahDefine.PolicyMap[query.PullPolicy]
 	} else {
 		if _, found := r.URL.Query()["pull"]; found {
 			if query.Pull {
-				pullPolicy = define.PullAlways
+				pullPolicy = buildahDefine.PullAlways
 			}
 		}
 	}
@@ -315,7 +314,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Decode()"))
 		return
 	}
-	buildOptions := imagebuildah.BuildOptions{
+	buildOptions := buildahDefine.BuildOptions{
 		AddCapabilities: addCaps,
 		AdditionalTags:  additionalTags,
 		Annotations:     annotations,
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go
index fae147440..f1cd77a9a 100644
--- a/pkg/api/handlers/compat/version.go
+++ b/pkg/api/handlers/compat/version.go
@@ -10,8 +10,8 @@ import (
 	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/pkg/api/handlers/utils"
 	"github.com/containers/podman/v3/pkg/domain/entities"
+	"github.com/containers/podman/v3/pkg/domain/entities/types"
 	"github.com/containers/podman/v3/version"
-	docker "github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 )
 
@@ -32,7 +32,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	components := []docker.ComponentVersion{{
+	components := []types.ComponentVersion{{
 		Name:    "Podman Engine",
 		Version: versionInfo.Version,
 		Details: map[string]string{
@@ -52,7 +52,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 	minVersion := version.APIVersion[version.Compat][version.MinimalAPI]
 
 	utils.WriteResponse(w, http.StatusOK, entities.ComponentVersion{
-		Version: docker.Version{
+		Version: types.Version{
 			Platform: struct {
 				Name string
 			}{