Merge pull request #79 from code-dot-org/docker-go-upgrade

Upgrade Docker client to v25 (API 1.44) and move build to Go 1.21

Author: Ompragash

.drone.yml

@@ -11,15 +11,15 @@ platform:
 
 steps:
   - name: test
-    image: golang:1.16
+    image: golang:1.21
     commands:
       - go test -cover ./...
     volumes:
       - name: go
         path: /go
 
   - name: build
-    image: golang:1.16
+    image: golang:1.21
     commands:
       - sh scripts/build.sh
     volumes:
@@ -43,15 +43,15 @@ pool:
 
 steps:
   - name: environment
-    image: golang:1.16
+    image: golang:1.21
     pull: always
     environment:
       CGO_ENABLED: "0"
     commands:
       - go version
       - go env
   - name: build
-    image: golang:1.16
+    image: golang:1.21
     environment:
       CGO_ENABLED: "0"
     commands:
@@ -96,15 +96,15 @@ pool:
 
 steps:
   - name: environment
-    image: golang:1.16
+    image: golang:1.21
     pull: always
     environment:
       CGO_ENABLED: "0"
     commands:
       - go version
       - go env
   - name: build
-    image: golang:1.16
+    image: golang:1.21
     environment:
       CGO_ENABLED: "0"
     commands:
@@ -149,15 +149,15 @@ pool:
 
 steps:
   - name: environment
-    image: golang:1.16
+    image: golang:1.21
     pull: always
     environment:
       CGO_ENABLED: "0"
     commands:
       - go version
       - go env
   - name: build
-    image: golang:1.16
+    image: golang:1.21
     environment:
       CGO_ENABLED: "0"
     commands:
@@ -203,15 +203,15 @@ pool:
 
 steps:
   - name: environment
-    image: golang:1.16
+    image: golang:1.21
     pull: always
     environment:
       CGO_ENABLED: "0"
     commands:
       - go version
       - go env
   - name: build
-    image: golang:1.16
+    image: golang:1.21
     environment:
       CGO_ENABLED: "0"
     commands:

BUILDING.md

@@ -1,4 +1,4 @@
-1. Install go 1.13 or higher
+1. Install go 1.21 or higher
 2. Test
 
     go test ./...

engine/engine.go

@@ -71,7 +71,7 @@ func (e *Docker) Setup(ctx context.Context, specv runtime.Spec) error {
 		if vol.EmptyDir == nil {
 			continue
 		}
-		_, err := e.client.VolumeCreate(ctx, volume.VolumeCreateBody{
+		_, err := e.client.VolumeCreate(ctx, volume.CreateOptions{
 			Name:   vol.EmptyDir.ID,
 			Driver: "local",
 			Labels: vol.EmptyDir.Labels,
@@ -261,6 +261,7 @@ func (e *Docker) create(ctx context.Context, spec *Spec, step *Step, output io.W
 		toConfig(spec, step),
 		toHostConfig(spec, step),
 		toNetConfig(spec, step),
+		nil,
 		step.ID,
 	)
 
@@ -285,6 +286,7 @@ func (e *Docker) create(ctx context.Context, spec *Spec, step *Step, output io.W
 			toConfig(spec, step),
 			toHostConfig(spec, step),
 			toNetConfig(spec, step),
+			nil,
 			step.ID,
 		)
 	}

go.mod

@@ -1,43 +1,64 @@
 module github.com/drone-runners/drone-runner-docker
 
-go 1.16
-
-replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
+go 1.21
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.11 // indirect
-	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
-	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
 	github.com/buildkite/yaml v2.1.0+incompatible
-	github.com/containerd/containerd v1.3.4 // indirect
 	github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
 	github.com/docker/distribution v2.7.1+incompatible
-	github.com/docker/docker v0.0.0-00010101000000-000000000000
-	github.com/docker/go-connections v0.3.0 // indirect
+	github.com/docker/docker v25.0.6+incompatible
 	github.com/drone/drone-go v1.7.1
 	github.com/drone/envsubst v1.0.3
 	github.com/drone/runner-go v1.12.0
 	github.com/drone/signal v1.0.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 // indirect
-	github.com/google/go-cmp v0.3.0
-	github.com/gorilla/mux v1.7.4 // indirect
+	github.com/google/go-cmp v0.7.0
 	github.com/joho/godotenv v1.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.8
+	github.com/sirupsen/logrus v1.9.3
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+)
+
+require (
+	github.com/99designs/basicauth-go v0.0.0-20160802081356-2a93ba0f464d // indirect
+	github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e // indirect
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
+	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
+	github.com/bmatcuk/doublestar v1.1.1 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.0.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+	github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/pkg/errors v0.8.1 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.3.0 // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
-	google.golang.org/grpc v1.29.1 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v2 v2.2.2 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
+	gotest.tools/v3 v3.5.2 // indirect
 )