Merge pull request #2427 from ibuildthecloud/main

Add docker client API version negotiation

Makefile

@@ -7,7 +7,7 @@ tidy:
 
 dev-reset: build
 	docker build -t localdev .
-	ACORN_IMAGE=localdev ACORN_LOCAL_PORT=6442 acorn local start --delete
+	ACORN_IMAGE=localdev ACORN_LOCAL_PORT=6442 ./bin/acorn local start --delete
 
 dev-install:
 	[ -e .dev-image ] && go mod vendor ; go run main.go install --dev "$$(cat .dev-image)"; rm -rf vendor

pkg/controller/local/services.go

@@ -26,7 +26,7 @@ type Handler struct {
 }
 
 func NewHandler() (*Handler, error) {
-	c, err := client.NewClientWithOpts(client.FromEnv)
+	c, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return nil, err
 	}

pkg/local/docker.go

@@ -43,7 +43,7 @@ type Container struct {
 }
 
 func NewContainer(_ context.Context) (*Container, error) {
-	cli, err := client.NewClientWithOpts(client.FromEnv)
+	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return nil, err
 	}