5 files changed, 23 insertions, 24 deletions
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index 21a8e7a8b..fd93c5ac7 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -22,14 +22,6 @@ import (
 	"golang.org/x/crypto/ssh/agent"
 )
 
-var (
-	BasePath = &url.URL{
-		Scheme: "http",
-		Host:   "d",
-		Path:   "/v" + version.APIVersion[version.Libpod][version.CurrentAPI].String() + "/libpod",
-	}
-)
-
 type APIResponse struct {
 	*http.Response
 	Request *http.Request
@@ -318,16 +310,24 @@ func (c *Connection) DoRequest(httpBody io.Reader, httpMethod, endpoint string,
 		err      error
 		response *http.Response
 	)
-	safePathValues := make([]interface{}, len(pathValues))
-	// Make sure path values are http url safe
+
+	params := make([]interface{}, len(pathValues)+3)
+
+	// Including the semver suffices breaks older services... so do not include them
+	v := version.APIVersion[version.Libpod][version.CurrentAPI]
+	params[0] = v.Major
+	params[1] = v.Minor
+	params[2] = v.Patch
 	for i, pv := range pathValues {
-		safePathValues[i] = url.PathEscape(pv)
+		// url.URL lacks the semantics for escaping embedded path parameters... so we manually
+		//   escape each one and assume the caller included the correct formatting in "endpoint"
+		params[i+3] = url.PathEscape(pv)
 	}
-	// Lets eventually use URL for this which might lead to safer
-	// usage
-	safeEndpoint := fmt.Sprintf(endpoint, safePathValues...)
-	e := BasePath.String() + safeEndpoint
-	req, err := http.NewRequest(httpMethod, e, httpBody)
+
+	uri := fmt.Sprintf("http://d/v%d.%d.%d/libpod"+endpoint, params...)
+	logrus.Debugf("DoRequest Method: %s URI: %v", httpMethod, uri)
+
+	req, err := http.NewRequest(httpMethod, uri, httpBody)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 17095b84b..c79d79136 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -174,7 +174,6 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	if len(platform) > 0 {
 		params.Set("platform", platform)
 	}
-
 	params.Set("pullpolicy", options.PullPolicy.String())
 
 	if options.Quiet {
diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go
index 1be2bdfdd..8680d6baa 100644
--- a/pkg/bindings/images/images.go
+++ b/pkg/bindings/images/images.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/containers/podman/v3/pkg/api/handlers"
+	"github.com/containers/podman/v3/pkg/api/handlers/types"
 	"github.com/containers/podman/v3/pkg/auth"
 	"github.com/containers/podman/v3/pkg/bindings"
 	"github.com/containers/podman/v3/pkg/domain/entities"
@@ -96,12 +96,12 @@ func Tree(ctx context.Context, nameOrID string, options *TreeOptions) (*entities
 }
 
 // History returns the parent layers of an image.
-func History(ctx context.Context, nameOrID string, options *HistoryOptions) ([]*handlers.HistoryResponse, error) {
+func History(ctx context.Context, nameOrID string, options *HistoryOptions) ([]*types.HistoryResponse, error) {
 	if options == nil {
 		options = new(HistoryOptions)
 	}
 	_ = options
-	var history []*handlers.HistoryResponse
+	var history []*types.HistoryResponse
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
 		return nil, err
diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go
index beecce7bf..e45e583f4 100644
--- a/pkg/bindings/images/rm.go
+++ b/pkg/bindings/images/rm.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/containers/podman/v3/pkg/api/handlers"
+	"github.com/containers/podman/v3/pkg/api/handlers/types"
 	"github.com/containers/podman/v3/pkg/bindings"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/containers/podman/v3/pkg/errorhandling"
@@ -19,7 +19,7 @@ func Remove(ctx context.Context, images []string, options *RemoveOptions) (*enti
 	// FIXME - bindings tests are missing for this endpoint. Once the CI is
 	// re-enabled for bindings, we need to add them.  At the time of writing,
 	// the tests don't compile.
-	var report handlers.LibpodImagesRemoveReport
+	var report types.LibpodImagesRemoveReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
 		return nil, []error{err}
diff --git a/pkg/bindings/images/types.go b/pkg/bindings/images/types.go
index 7bf70c82b..1f3e46729 100644
--- a/pkg/bindings/images/types.go
+++ b/pkg/bindings/images/types.go
@@ -1,7 +1,7 @@
 package images
 
 import (
-	"github.com/containers/buildah/imagebuildah"
+	buildahDefine "github.com/containers/buildah/define"
 )
 
 //go:generate go run ../generator/generator.go RemoveOptions
@@ -162,7 +162,7 @@ type PullOptions struct {
 
 //BuildOptions are optional options for building images
 type BuildOptions struct {
-	imagebuildah.BuildOptions
+	buildahDefine.BuildOptions
 }
 
 //go:generate go run ../generator/generator.go ExistsOptions