Merge pull request #16 from bigcommerce/INFRA-26220/upgrade-docker-api-version

INFRA-26220: Bump default Docker API version to 1.40

Author: joec4i

.circleci/config.yml

@@ -13,9 +13,9 @@ orbs:
 executors:
   go:
     docker:
-      - image: cimg/go:1.23
+      - image: cimg/go:1.26
         environment:
-          DOCKER_API_VERSION: 1.39
+          DOCKER_API_VERSION: '1.40'
 
 #################################################################################
 # Jobs

.env-example

@@ -1 +1 @@
-export DOCKER_API_VERSION=1.39
+export DOCKER_API_VERSION=1.40

.gitignore

@@ -1,5 +1,6 @@
 tmp
 bonvoy
+bin/
 dist/
 .idea/
 *.iml

Makefile

@@ -5,16 +5,18 @@ GOCLEAN := $(GOCMD) clean
 PATH := ${GOBIN}:${PATH}
 
 export PATH
-OBJECT=bonvoy
+BINARY_NAME=./bin/bonvoy
 
 default: deps build
 
 clean:
 	$(GOCLEAN)
-	rm -f $(OBJECT)
+	rm -f $(BINARY_NAME)
+	rm -f $(BINARY_NAME)-linux-amd64
 
 build:
-	$(GOBUILD) -v -o ${OBJECT}
+	mkdir -p bin
+	$(GOBUILD) -v -o $(BINARY_NAME) .
 
 deps:
 	$(GOCMD) mod tidy
@@ -34,4 +36,4 @@ test-unit:
 	$(GOCMD) test -v -coverprofile=c.out $$(go list ./... | grep -v vendor/)
 
 build-linux:
-	GOOS=linux GOARCH=amd64 $(GOBUILD) -v -o ${OBJECT}-linux-amd64
+	GOOS=linux GOARCH=amd64 $(GOBUILD) -v -o $(BINARY_NAME)-linux-amd64

README.md

@@ -5,7 +5,7 @@
 A simple go CLI tool to perform various tasks against Envoy sidecars in a Consul
 Connect and Nomad environment.
 
-Supports Consul 1.10+, Nomad 1.1.3+, and Envoy 1.18+. Requires DOCKER_API_VERSION 1.39.
+Supports Consul 1.10+, Nomad 1.1.3+, Envoy 1.18+, and Docker CE 29+. Defaults to `DOCKER_API_VERSION` 1.40 when unset.
 
 ## Usage
 

bonvoy.go

@@ -8,7 +8,9 @@ import (
 )
 
 func main() {
-	_ = os.Setenv("DOCKER_API_VERSION", "1.39")
+	if os.Getenv("DOCKER_API_VERSION") == "" {
+		_ = os.Setenv("DOCKER_API_VERSION", "1.40")
+	}
 	config.Load()
 	commands.NewRegistry().Init()
 }

docker/client.go

@@ -62,7 +62,7 @@ func (c *Client) GetSidecarContainer(serviceName string) (types.ContainerJSON, e
 	} else if len(containerNames) == 1 {
 		desiredName = containerNames[0]
 	} else {
-		return types.ContainerJSON{}, fmt.Errorf("No sidecar found for name: " + serviceName)
+		return types.ContainerJSON{}, fmt.Errorf("No sidecar found for name: %s", serviceName)
 	}
 
 	var desiredId = ""

docker/client_test.go

@@ -1,12 +1,16 @@
 package docker
 
-import "testing"
+import (
+	"os"
+	"testing"
+)
 
 func TestNewClient(t *testing.T) {
 	t.Run("returns a Client from env", func(t *testing.T) {
+		_ = os.Setenv("DOCKER_API_VERSION", "1.40")
 		client := NewClient()
-		if client.cli.ClientVersion() != "1.39" {
-			t.Error("Invalid client version returned: " + client.cli.ClientVersion() + " != 1.39")
+		if client.cli.ClientVersion() != "1.40" {
+			t.Error("Invalid client version returned: " + client.cli.ClientVersion() + " != 1.40")
 		}
 	})
 }

go.mod

@@ -1,6 +1,6 @@
 module bonvoy
 
-go 1.23
+go 1.26
 
 require (
 	github.com/Devatoria/go-nsenter v0.0.0-20170612091819-0aa1e5f7748c

script/build-remote

@@ -4,7 +4,7 @@ set -xeou pipefail
 
 cd /opt/bonvoy || exit 1
 
-export DOCKER_API_VERSION=1.39
+export DOCKER_API_VERSION=1.40
 
 go mod tidy
 go build bonvoy