Docker API client version bumped to 1.24 everywhere
This commit is contained in:
1 parent
55a46992d4
commit
e50040883f
12 files changed
+118
-27
No files matched your search
@@ -14,7 +14,7 @@ func containerAddrs(args []string) error {
|
||||
}
|
||||
bridgeName := args[0]
|
||||
|
||||
client, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
client, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func inspectContainer(containerNameOrID string) (*docker.Container, error) {
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
@@ -174,7 +174,7 @@ func parseContainerArgs(args []string) docker.CreateContainerOptions {
|
||||
func runContainer(args []string) error {
|
||||
containerOptions := parseContainerArgs(args)
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
@@ -206,7 +206,7 @@ func listContainers(args []string) error {
|
||||
cmdUsage("list-containers", "[<label>]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
@@ -233,7 +233,7 @@ func stopContainer(args []string) error {
|
||||
cmdUsage("stop-container", "<container-id> [<container-id2> ...]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
@@ -252,7 +252,7 @@ func killContainer(args []string) error {
|
||||
cmdUsage("kill-container", "<container-id> [<container-id2> ...]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
@@ -288,7 +288,7 @@ func removeContainer(args []string) error {
|
||||
}
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
)
|
||||
|
||||
const defaulDockerAPIVersion = "1.24"
|
||||
const swarmDockerAPIVersion = "1.26"
|
||||
|
||||
// newVersionedDockerClientFromEnv offers some control over the version
|
||||
// of the docker client weaveutil uses for a number of operations.
|
||||
// The version specified by the caller, usually defaulDockerAPIVersion,
|
||||
// may be overridden by setting an environment variable called
|
||||
// DOCKER_API_VERSION.
|
||||
func newVersionedDockerClientFromEnv(apiVersionString string) (*docker.Client, error) {
|
||||
overridenAPIVersion, ok := os.LookupEnv("DOCKER_API_VERSION")
|
||||
if ok && overridenAPIVersion != "" {
|
||||
apiVersionString = overridenAPIVersion
|
||||
}
|
||||
return docker.NewVersionedClientFromEnv(apiVersionString)
|
||||
}
|
||||
@@ -90,6 +90,8 @@ func usage() {
|
||||
for cmd := range commands {
|
||||
fmt.Fprintln(os.Stderr, cmd)
|
||||
}
|
||||
fmt.Fprintln(os.Stderr)
|
||||
fmt.Fprintf(os.Stderr, "Set an environment variable called DOCKER_API_VERSION to control the API version used.\nDefault is: %v\n", defaulDockerAPIVersion)
|
||||
}
|
||||
|
||||
func cmdUsage(cmd string, usage string) {
|
||||
|
||||
@@ -75,9 +75,9 @@ func isDockerPluginEnabled(args []string) error {
|
||||
}
|
||||
|
||||
func newDockerClient() (*docker.Client, error) {
|
||||
// API 1.21 is the first version that supports docker network
|
||||
// commands
|
||||
c, err := docker.NewVersionedClientFromEnv("1.21")
|
||||
// API 1.21 was the first version that supports docker network
|
||||
// commands. In March 2024, the minimum suupported API is 1.24
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
@@ -4,12 +4,10 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/fsouza/go-dockerclient"
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
const DOCKER_API_VERSION = "1.26"
|
||||
|
||||
func swarmManagerPeers(args []string) error {
|
||||
info, err := dockerInfo()
|
||||
if err != nil {
|
||||
@@ -32,7 +30,7 @@ func swarmManagerPeers(args []string) error {
|
||||
}
|
||||
|
||||
func dockerInfo() (*docker.DockerInfo, error) {
|
||||
client, err := docker.NewVersionedClientFromEnv(DOCKER_API_VERSION)
|
||||
client, err := newVersionedDockerClientFromEnv(swarmDockerAPIVersion)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "docker.NewVersionedClientFromEnv")
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ func createVolumeContainer(args []string) error {
|
||||
label := args[2]
|
||||
bindMounts := args[3:]
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
c, err := newVersionedDockerClientFromEnv(defaulDockerAPIVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user