Merge pull request #9601 from jwhonce/issues/9207

Use version package to track all versions

17 files changed, 127 insertions, 154 deletions

diff --git a/libpod/define/version.go b/libpod/define/version.go
index 67dc730ac..5249b5d84 100644
--- a/libpod/define/version.go
+++ b/libpod/define/version.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	podmanVersion "github.com/containers/podman/v3/version"
+	"github.com/containers/podman/v3/version"
 )
 
 // Overwritten at build time
@@ -42,8 +42,8 @@ func GetVersion() (Version, error) {
 		}
 	}
 	return Version{
-		APIVersion: podmanVersion.APIVersion.String(),
-		Version:    podmanVersion.Version.String(),
+		APIVersion: version.APIVersion[version.Libpod][version.CurrentAPI].String(),
+		Version:    version.Version.String(),
 		GoVersion:  runtime.Version(),
 		GitCommit:  gitCommit,
 		BuiltTime:  time.Unix(buildTime, 0).Format(time.ANSIC),
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go
index d90a892c1..fae147440 100644
--- a/pkg/api/handlers/compat/version.go
+++ b/pkg/api/handlers/compat/version.go
@@ -10,6 +10,7 @@ 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/version"
 	docker "github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 )
@@ -35,20 +36,20 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 		Name:    "Podman Engine",
 		Version: versionInfo.Version,
 		Details: map[string]string{
-			"APIVersion":    utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String(),
+			"APIVersion":    version.APIVersion[version.Libpod][version.CurrentAPI].String(),
 			"Arch":          goRuntime.GOARCH,
 			"BuildTime":     time.Unix(versionInfo.Built, 0).Format(time.RFC3339),
 			"Experimental":  "true",
 			"GitCommit":     versionInfo.GitCommit,
 			"GoVersion":     versionInfo.GoVersion,
 			"KernelVersion": infoData.Host.Kernel,
-			"MinAPIVersion": utils.APIVersion[utils.LibpodTree][utils.MinimalAPIVersion].String(),
+			"MinAPIVersion": version.APIVersion[version.Libpod][version.MinimalAPI].String(),
 			"Os":            goRuntime.GOOS,
 		},
 	}}
 
-	apiVersion := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion]
-	minVersion := utils.APIVersion[utils.CompatTree][utils.MinimalAPIVersion]
+	apiVersion := version.APIVersion[version.Compat][version.CurrentAPI]
+	minVersion := version.APIVersion[version.Compat][version.MinimalAPI]
 
 	utils.WriteResponse(w, http.StatusOK, entities.ComponentVersion{
 		Version: docker.Version{
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index b3c674788..7625f9546 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -10,49 +10,14 @@ import (
 	"unsafe"
 
 	"github.com/blang/semver"
+	"github.com/containers/podman/v3/version"
 	"github.com/gorilla/mux"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
-type (
-	// VersionTree determines which API endpoint tree for version
-	VersionTree int
-	// VersionLevel determines which API level, current or something from the past
-	VersionLevel int
-)
-
-const (
-	// LibpodTree supports Libpod endpoints
-	LibpodTree = VersionTree(iota)
-	// CompatTree supports Libpod endpoints
-	CompatTree
-
-	// CurrentAPIVersion announces what is the current API level
-	CurrentAPIVersion = VersionLevel(iota)
-	// MinimalAPIVersion announces what is the oldest API level supported
-	MinimalAPIVersion
-)
-
 var (
-	// See https://docs.docker.com/engine/api/v1.40/
-	// libpod compat handlers are expected to honor docker API versions
-
-	// APIVersion provides the current and minimal API versions for compat and libpod endpoint trees
-	// Note: GET|HEAD /_ping is never versioned and provides the API-Version and Libpod-API-Version headers to allow
-	//       clients to shop for the Version they wish to support
-	APIVersion = map[VersionTree]map[VersionLevel]semver.Version{
-		LibpodTree: {
-			CurrentAPIVersion: semver.MustParse("3.0.0"),
-			MinimalAPIVersion: semver.MustParse("3.0.0"),
-		},
-		CompatTree: {
-			CurrentAPIVersion: semver.MustParse("1.40.0"),
-			MinimalAPIVersion: semver.MustParse("1.24.0"),
-		},
-	}
-
 	// ErrVersionNotGiven returned when version not given by client
 	ErrVersionNotGiven = errors.New("version not given in URL path")
 	// ErrVersionNotSupported returned when given version is too old
@@ -98,14 +63,14 @@ func SupportedVersion(r *http.Request, condition string) (semver.Version, error)
 // SupportedVersionWithDefaults validates that the version provided by client valid is supported by server
 // minimal API version <= client path version <= maximum API version focused on the endpoint tree from URL
 func SupportedVersionWithDefaults(r *http.Request) (semver.Version, error) {
-	tree := CompatTree
+	tree := version.Compat
 	if IsLibpodRequest(r) {
-		tree = LibpodTree
+		tree = version.Libpod
 	}
 
 	return SupportedVersion(r,
-		fmt.Sprintf(">=%s <=%s", APIVersion[tree][MinimalAPIVersion].String(),
-			APIVersion[tree][CurrentAPIVersion].String()))
+		fmt.Sprintf(">=%s <=%s", version.APIVersion[tree][version.MinimalAPI].String(),
+			version.APIVersion[tree][version.CurrentAPI].String()))
 }
 
 // WriteResponse encodes the given value as JSON or string and renders it for http client
diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go
index d9fd22b80..18a1d2678 100644
--- a/pkg/api/handlers/utils/handler_test.go
+++ b/pkg/api/handlers/utils/handler_test.go
@@ -7,17 +7,18 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/containers/podman/v3/version"
 	"github.com/gorilla/mux"
 )
 
 func TestSupportedVersion(t *testing.T) {
 	req, err := http.NewRequest("GET",
-		fmt.Sprintf("/v%s/libpod/testing/versions", APIVersion[LibpodTree][CurrentAPIVersion]),
+		fmt.Sprintf("/v%s/libpod/testing/versions", version.APIVersion[version.Libpod][version.CurrentAPI]),
 		nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	req = mux.SetURLVars(req, map[string]string{"version": APIVersion[LibpodTree][CurrentAPIVersion].String()})
+	req = mux.SetURLVars(req, map[string]string{"version": version.APIVersion[version.Libpod][version.CurrentAPI].String()})
 
 	rr := httptest.NewRecorder()
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go
index e7bf94fc6..28b8706a8 100644
--- a/pkg/api/server/handler_api.go
+++ b/pkg/api/server/handler_api.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/containers/podman/v3/pkg/api/handlers/utils"
 	"github.com/containers/podman/v3/pkg/auth"
+	"github.com/containers/podman/v3/version"
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
 )
@@ -55,10 +56,10 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc {
 			c = context.WithValue(c, "idletracker", s.idleTracker)    // nolint
 			r = r.WithContext(c)
 
-			cv := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion]
+			cv := version.APIVersion[version.Compat][version.CurrentAPI]
 			w.Header().Set("API-Version", fmt.Sprintf("%d.%d", cv.Major, cv.Minor))
 
-			lv := utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String()
+			lv := version.APIVersion[version.Libpod][version.CurrentAPI].String()
 			w.Header().Set("Libpod-API-Version", lv)
 			w.Header().Set("Server", "Libpod/"+lv+" ("+runtime.GOOS+")")
 
@@ -72,5 +73,5 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc {
 // VersionedPath prepends the version parsing code
 // any handler may override this default when registering URL(s)
 func VersionedPath(p string) string {
-	return "/v{version:[0-9][0-9.]*}" + p
+	return "/v{version:[0-9][0-9A-Za-z.-]*}" + p
 }
diff --git a/pkg/bindings/bindings.go b/pkg/bindings/bindings.go
deleted file mode 100644
index 14f306910..000000000
--- a/pkg/bindings/bindings.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Package bindings provides golang-based access
-// to the Podman REST API.  Users can then interact with API endpoints
-// to manage containers, images, pods, etc.
-//
-// This package exposes a series of methods that allow users to firstly
-// create their connection with the API endpoints.  Once the connection
-// is established, users can then manage the Podman container runtime.
-package bindings
-
-import (
-	"github.com/blang/semver"
-)
-
-var (
-	// PTrue is a convenience variable that can be used in bindings where
-	// a pointer to a bool (optional parameter) is required.
-	pTrue = true
-	PTrue = &pTrue
-	// PFalse is a convenience variable that can be used in bindings where
-	// a pointer to a bool (optional parameter) is required.
-	pFalse = false
-	PFalse = &pFalse
-
-	// APIVersion - podman will fail to run if this value is wrong
-	APIVersion = semver.MustParse("2.0.0")
-)
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index ad16498d5..21a8e7a8b 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/containers/podman/v3/pkg/terminal"
+	"github.com/containers/podman/v3/version"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -25,7 +26,7 @@ var (
 	BasePath = &url.URL{
 		Scheme: "http",
 		Host:   "d",
-		Path:   "/v" + APIVersion.String() + "/libpod",
+		Path:   "/v" + version.APIVersion[version.Libpod][version.CurrentAPI].String() + "/libpod",
 	}
 )
 
@@ -168,15 +169,16 @@ func pingNewConnection(ctx context.Context) error {
 			return err
 		}
 
-		switch APIVersion.Compare(versionSrv) {
+		switch version.APIVersion[version.Libpod][version.MinimalAPI].Compare(versionSrv) {
 		case -1, 0:
 			// Server's job when Client version is equal or older
 			return nil
 		case 1:
-			return errors.Errorf("server API version is too old. Client %q server %q", APIVersion.String(), versionSrv.String())
+			return errors.Errorf("server API version is too old. Client %q server %q",
+				version.APIVersion[version.Libpod][version.MinimalAPI].String(), versionSrv.String())
 		}
 	}
-	return errors.Errorf("ping response was %q", response.StatusCode)
+	return errors.Errorf("ping response was %d", response.StatusCode)
 }
 
 func sshClient(_url *url.URL, secure bool, passPhrase string, identity string) (Connection, error) {
diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go
index 16090e104..fbdf18d44 100644
--- a/pkg/bindings/test/attach_test.go
+++ b/pkg/bindings/test/attach_test.go
@@ -35,7 +35,7 @@ var _ = Describe("Podman containers attach", func() {
 
 	It("can run top in container", func() {
 		name := "TopAttachTest"
-		id, err := bt.RunTopContainer(&name, nil, nil)
+		id, err := bt.RunTopContainer(&name, nil)
 		Expect(err).ShouldNot(HaveOccurred())
 
 		tickTock := time.NewTimer(2 * time.Second)
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index 588f38930..9bac4b620 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -188,14 +188,14 @@ func (b *bindingTest) restoreImageFromCache(i testImage) {
 
 // Run a container within or without a pod
 // and add or append the alpine image to it
-func (b *bindingTest) RunTopContainer(containerName *string, insidePod *bool, podName *string) (string, error) {
+func (b *bindingTest) RunTopContainer(containerName *string, podName *string) (string, error) {
 	s := specgen.NewSpecGenerator(alpine.name, false)
 	s.Terminal = false
 	s.Command = []string{"/usr/bin/top"}
 	if containerName != nil {
 		s.Name = *containerName
 	}
-	if insidePod != nil && podName != nil {
+	if podName != nil {
 		s.Pod = *podName
 	}
 	ctr, err := containers.CreateWithSpec(b.conn, s, nil)
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index f2ab197ce..b0ddc7862 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -55,7 +55,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a running container by name", func() {
 		// Pausing by name should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -69,7 +69,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a running container by id", func() {
 		// Pausing by id should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -83,7 +83,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman unpause a running container by name", func() {
 		// Unpausing by name should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -99,7 +99,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman unpause a running container by ID", func() {
 		// Unpausing by ID should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Pause by name
 		err = containers.Pause(bt.conn, name, nil)
@@ -118,7 +118,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a paused container by name", func() {
 		// Pausing a paused container by name should fail
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -131,7 +131,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a paused container by id", func() {
 		// Pausing a paused container by id should fail
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -144,7 +144,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a stopped container by name", func() {
 		// Pausing a stopped container by name should fail
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -157,7 +157,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman pause a stopped container by id", func() {
 		// Pausing a stopped container by id should fail
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -170,7 +170,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman remove a paused container by id without force", func() {
 		// Removing a paused container without force should fail
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -183,7 +183,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman remove a paused container by id with force", func() {
 		// Removing a paused container with force should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -194,7 +194,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman stop a paused container by name", func() {
 		// Stopping a paused container by name should fail
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -207,7 +207,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman stop a paused container by id", func() {
 		// Stopping a paused container by id should fail
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -220,7 +220,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman stop a running container by name", func() {
 		// Stopping a running container by name should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -234,7 +234,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman stop a running container by ID", func() {
 		// Stopping a running container by ID should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -256,7 +256,7 @@ var _ = Describe("Podman containers ", func() {
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		errChan := make(chan error)
-		_, err = bt.RunTopContainer(&name, nil, nil)
+		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		go func() {
 			exitCode, err = containers.Wait(bt.conn, name, nil)
@@ -278,7 +278,7 @@ var _ = Describe("Podman containers ", func() {
 			running        = define.ContainerStateRunning
 		)
 		errChan := make(chan error)
-		_, err := bt.RunTopContainer(&name, nil, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		go func() {
 			exitCode, err = containers.Wait(bt.conn, name, new(containers.WaitOptions).WithCondition([]define.ContainerStatus{pause}))
@@ -317,7 +317,7 @@ var _ = Describe("Podman containers ", func() {
 
 		// a container that has no healthcheck should be a 409
 		var name = "top"
-		bt.RunTopContainer(&name, bindings.PFalse, nil)
+		bt.RunTopContainer(&name, nil)
 		_, err = containers.RunHealthCheck(bt.conn, name, nil)
 		Expect(err).ToNot(BeNil())
 		code, _ = bindings.CheckResponseCode(err)
@@ -376,7 +376,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman top", func() {
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 
 		// By name
@@ -414,7 +414,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman container exists in local storage by name", func() {
 		// Container existence check by name should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		containerExists, err := containers.Exists(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -424,7 +424,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman container exists in local storage by ID", func() {
 		// Container existence check by ID should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		containerExists, err := containers.Exists(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
@@ -434,7 +434,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman container exists in local storage by short ID", func() {
 		// Container existence check by short ID should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		containerExists, err := containers.Exists(bt.conn, cid[0:12], nil)
 		Expect(err).To(BeNil())
@@ -452,7 +452,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman kill a running container by name with SIGINT", func() {
 		// Killing a running container should work
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Kill(bt.conn, name, new(containers.KillOptions).WithSignal("SIGINT"))
 		Expect(err).To(BeNil())
@@ -463,7 +463,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman kill a running container by ID with SIGTERM", func() {
 		// Killing a running container by ID should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Kill(bt.conn, cid, new(containers.KillOptions).WithSignal("SIGTERM"))
 		Expect(err).To(BeNil())
@@ -474,7 +474,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman kill a running container by ID with SIGKILL", func() {
 		// Killing a running container by ID with TERM should work
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Kill(bt.conn, cid, new(containers.KillOptions).WithSignal("SIGKILL"))
 		Expect(err).To(BeNil())
@@ -483,7 +483,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman kill a running container by bogus signal", func() {
 		//Killing a running container by bogus signal should fail
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Kill(bt.conn, cid, new(containers.KillOptions).WithSignal("foobar"))
 		Expect(err).ToNot(BeNil())
@@ -495,9 +495,9 @@ var _ = Describe("Podman containers ", func() {
 		// Killing latest container should work
 		var name1 = "first"
 		var name2 = "second"
-		_, err := bt.RunTopContainer(&name1, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name1, nil)
 		Expect(err).To(BeNil())
-		_, err = bt.RunTopContainer(&name2, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name2, nil)
 		Expect(err).To(BeNil())
 		containerLatestList, err := containers.List(bt.conn, new(containers.ListOptions).WithLast(1))
 		Expect(err).To(BeNil())
@@ -526,7 +526,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman prune stopped containers", func() {
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -541,7 +541,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman prune stopped containers with filters", func() {
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -575,7 +575,7 @@ var _ = Describe("Podman containers ", func() {
 	It("podman prune running containers", func() {
 		// Start the container.
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 
 		// Check if the container is running.
@@ -598,7 +598,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman inspect running container", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Inspecting running container should succeed
 		_, err = containers.Inspect(bt.conn, name, nil)
@@ -607,7 +607,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman inspect stopped container", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -618,7 +618,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman inspect running container with size", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		_, err = containers.Inspect(bt.conn, name, new(containers.InspectOptions).WithSize(true))
 		Expect(err).To(BeNil())
@@ -626,7 +626,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman inspect stopped container with size", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -643,7 +643,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman remove running container by name", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, name, nil)
@@ -654,7 +654,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman remove running container by ID", func() {
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, cid, nil)
@@ -665,7 +665,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman forcibly remove running container by name", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, name, new(containers.RemoveOptions).WithForce(true))
@@ -676,7 +676,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman forcibly remove running container by ID", func() {
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, cid, new(containers.RemoveOptions).WithForce(true))
@@ -687,7 +687,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman remove running container and volume by name", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, name, new(containers.RemoveOptions).WithVolumes(true))
@@ -698,7 +698,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman remove running container and volume by ID", func() {
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, cid, new(containers.RemoveOptions).WithVolumes(true))
@@ -709,7 +709,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman forcibly remove running container and volume by name", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, name, new(containers.RemoveOptions).WithVolumes(true).WithForce(true))
@@ -720,7 +720,7 @@ var _ = Describe("Podman containers ", func() {
 
 	It("podman forcibly remove running container and volume by ID", func() {
 		var name = "top"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		// Removing running container should fail
 		err = containers.Remove(bt.conn, cid, new(containers.RemoveOptions).WithForce(true).WithVolumes(true))
@@ -732,9 +732,9 @@ var _ = Describe("Podman containers ", func() {
 	It("List containers with filters", func() {
 		var name = "top"
 		var name2 = "top2"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
-		_, err = bt.RunTopContainer(&name2, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name2, nil)
 		Expect(err).To(BeNil())
 		s := specgen.NewSpecGenerator(alpine.name, false)
 		s.Terminal = true
@@ -753,7 +753,7 @@ var _ = Describe("Podman containers ", func() {
 		podName := "testpod"
 		ctrName := "testctr"
 		bt.Podcreate(&podName)
-		_, err := bt.RunTopContainer(&ctrName, bindings.PTrue, &podName)
+		_, err := bt.RunTopContainer(&ctrName, &podName)
 		Expect(err).To(BeNil())
 
 		lastNum := 1
diff --git a/pkg/bindings/test/exec_test.go b/pkg/bindings/test/exec_test.go
index 7a21be77f..c10452eaf 100644
--- a/pkg/bindings/test/exec_test.go
+++ b/pkg/bindings/test/exec_test.go
@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/containers/podman/v3/pkg/api/handlers"
-	"github.com/containers/podman/v3/pkg/bindings"
 	"github.com/containers/podman/v3/pkg/bindings/containers"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -33,7 +32,7 @@ var _ = Describe("Podman containers exec", func() {
 
 	It("Podman exec create makes an exec session", func() {
 		name := "testCtr"
-		cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		cid, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 
 		execConfig := new(handlers.ExecCreateConfig)
@@ -53,7 +52,7 @@ var _ = Describe("Podman containers exec", func() {
 
 	It("Podman exec create with bad command fails", func() {
 		name := "testCtr"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 
 		execConfig := new(handlers.ExecCreateConfig)
diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go
index db51d1e68..688bf049f 100644
--- a/pkg/bindings/test/images_test.go
+++ b/pkg/bindings/test/images_test.go
@@ -101,7 +101,7 @@ var _ = Describe("Podman images", func() {
 
 		// Start a container with alpine image
 		var top string = "top"
-		_, err = bt.RunTopContainer(&top, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&top, nil)
 		Expect(err).To(BeNil())
 		// we should now have a container called "top" running
 		containerResponse, err := containers.Inspect(bt.conn, "top", nil)
diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go
index 3ca4b99b3..f61e8c370 100644
--- a/pkg/bindings/test/info_test.go
+++ b/pkg/bindings/test/info_test.go
@@ -49,17 +49,17 @@ var _ = Describe("Podman info", func() {
 		_, err := containers.CreateWithSpec(bt.conn, s, nil)
 		Expect(err).To(BeNil())
 
-		idPause, err := bt.RunTopContainer(nil, nil, nil)
+		idPause, err := bt.RunTopContainer(nil, nil)
 		Expect(err).To(BeNil())
 		err = containers.Pause(bt.conn, idPause, nil)
 		Expect(err).To(BeNil())
 
-		idStop, err := bt.RunTopContainer(nil, nil, nil)
+		idStop, err := bt.RunTopContainer(nil, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, idStop, nil)
 		Expect(err).To(BeNil())
 
-		_, err = bt.RunTopContainer(nil, nil, nil)
+		_, err = bt.RunTopContainer(nil, nil)
 		Expect(err).To(BeNil())
 
 		info, err := system.Info(bt.conn, nil)
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 2b4eb05d3..b06ff31a2 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 
 		// Adding an alpine container to the existing pod
-		_, err = bt.RunTopContainer(nil, bindings.PTrue, &newpod)
+		_, err = bt.RunTopContainer(nil, &newpod)
 		Expect(err).To(BeNil())
 		podSummary, err = pods.List(bt.conn, nil)
 		// Verify no errors.
@@ -93,7 +93,7 @@ var _ = Describe("Podman pods", func() {
 		_, err = pods.Start(bt.conn, newpod, nil)
 		Expect(err).To(BeNil())
 
-		_, err = bt.RunTopContainer(nil, bindings.PTrue, &newpod)
+		_, err = bt.RunTopContainer(nil, &newpod)
 		Expect(err).To(BeNil())
 
 		// Expected err with invalid filter params
@@ -179,7 +179,7 @@ var _ = Describe("Podman pods", func() {
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		// Adding an alpine container to the existing pod
-		_, err = bt.RunTopContainer(nil, bindings.PTrue, &newpod)
+		_, err = bt.RunTopContainer(nil, &newpod)
 		Expect(err).To(BeNil())
 
 		// Binding needs to be modified to inspect the pod state.
diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go
index a68a8099c..68e9d9301 100644
--- a/pkg/bindings/test/system_test.go
+++ b/pkg/bindings/test/system_test.go
@@ -4,7 +4,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containers/podman/v3/pkg/bindings"
 	"github.com/containers/podman/v3/pkg/bindings/containers"
 	"github.com/containers/podman/v3/pkg/bindings/pods"
 	"github.com/containers/podman/v3/pkg/bindings/system"
@@ -41,7 +40,7 @@ var _ = Describe("Podman system", func() {
 
 	It("podman events", func() {
 		var name = "top"
-		_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 
 		filters := make(map[string][]string)
@@ -72,7 +71,7 @@ var _ = Describe("Podman system", func() {
 		Expect(err).To(BeNil())
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err = bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
@@ -98,14 +97,14 @@ var _ = Describe("Podman system", func() {
 
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err = bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
 
 		// Start container and leave in running
 		var name2 = "top2"
-		_, err = bt.RunTopContainer(&name2, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name2, nil)
 		Expect(err).To(BeNil())
 
 		// Adding an unused volume
@@ -132,14 +131,14 @@ var _ = Describe("Podman system", func() {
 
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err = bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
 
 		// Start second container and leave in running
 		var name2 = "top2"
-		_, err = bt.RunTopContainer(&name2, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name2, nil)
 		Expect(err).To(BeNil())
 
 		// Adding an unused volume should work
@@ -167,14 +166,14 @@ var _ = Describe("Podman system", func() {
 
 		// Start and stop a container to enter in exited state.
 		var name = "top"
-		_, err = bt.RunTopContainer(&name, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		err = containers.Stop(bt.conn, name, nil)
 		Expect(err).To(BeNil())
 
 		// Start second container and leave in running
 		var name2 = "top2"
-		_, err = bt.RunTopContainer(&name2, bindings.PFalse, nil)
+		_, err = bt.RunTopContainer(&name2, nil)
 		Expect(err).To(BeNil())
 
 		// Adding an unused volume should work
diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
index 1ddf49c6f..1357e0ca6 100644
--- a/test/apiv2/01-basic.at
+++ b/test/apiv2/01-basic.at
@@ -18,7 +18,7 @@ t HEAD libpod/_ping 200
 for i in /version version; do
     t GET  $i      200                           \
       .Components[0].Name="Podman Engine"        \
-      .Components[0].Details.APIVersion=3.0.0    \
+      .Components[0].Details.APIVersion=3.1.0-dev    \
       .Components[0].Details.MinAPIVersion=3.0.0 \
       .Components[0].Details.Os=linux            \
       .ApiVersion=1.40                          \
diff --git a/version/version.go b/version/version.go
index 520014bb7..6b93ed8ea 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,44 @@ import (
 	"github.com/blang/semver"
 )
 
+type (
+	// Tree determines which API endpoint tree for version
+	Tree int
+	// Level determines which API level, current or something from the past
+	Level int
+)
+
+const (
+	// Libpod supports Libpod endpoints
+	Libpod = Tree(iota)
+	// Compat supports Libpod endpoints
+	Compat
+
+	// CurrentAPI announces what is the current API level
+	CurrentAPI = Level(iota)
+	// MinimalAPI announces what is the oldest API level supported
+	MinimalAPI
+)
+
 // Version is the version of the build.
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
 var Version = semver.MustParse("3.1.0-dev")
 
-// APIVersion is the version for the remote
-// client API.  It is used to determine compatibility
-// between a remote podman client and its backend
-var APIVersion = semver.MustParse("3.0.0")
+// See https://docs.docker.com/engine/api/v1.40/
+// libpod compat handlers are expected to honor docker API versions
+
+// APIVersion provides the current and minimal API versions for compat and libpod endpoint trees
+// Note: GET|HEAD /_ping is never versioned and provides the API-Version and Libpod-API-Version headers to allow
+//       clients to shop for the Version they wish to support
+var APIVersion = map[Tree]map[Level]semver.Version{
+	Libpod: {
+		CurrentAPI: Version,
+		MinimalAPI: semver.MustParse("3.0.0"),
+	},
+	Compat: {
+		CurrentAPI: semver.MustParse("1.40.0"),
+		MinimalAPI: semver.MustParse("1.24.0"),
+	},
+}