add sleep

.drone.yml

@@ -162,7 +162,7 @@ platform:
 
 steps:
   - name: go build
-    image: golang:1.22.7
+    image: golang:1.22.4
     environment:
       CGO_ENABLED: 0
     commands:
@@ -264,7 +264,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker'
     environment:
@@ -275,7 +275,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker'
     environment:
@@ -285,7 +285,7 @@ steps:
         - tag
 
   - name: executable
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - ./release/linux/amd64/drone-docker --help
 
@@ -329,7 +329,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker'
     environment:
@@ -340,7 +340,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker'
     environment:
@@ -350,7 +350,7 @@ steps:
         - tag
 
   - name: executable
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - ./release/linux/arm64/drone-docker --help
 
@@ -429,7 +429,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-gcr ./cmd/drone-gcr'
     environment:
@@ -440,7 +440,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-gcr ./cmd/drone-gcr'
     environment:
@@ -488,7 +488,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-gcr ./cmd/drone-gcr'
     environment:
@@ -499,7 +499,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-gcr ./cmd/drone-gcr'
     environment:
@@ -582,7 +582,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-gar ./cmd/drone-gar'
     environment:
@@ -593,7 +593,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-gar ./cmd/drone-gar'
     environment:
@@ -641,7 +641,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-gar ./cmd/drone-gar'
     environment:
@@ -652,7 +652,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-gar ./cmd/drone-gar'
     environment:
@@ -734,7 +734,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-ecr ./cmd/drone-ecr'
     environment:
@@ -744,7 +744,7 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-ecr ./cmd/drone-ecr'
     environment:
@@ -792,7 +792,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-ecr ./cmd/drone-ecr'
     environment:
@@ -802,7 +802,7 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-ecr ./cmd/drone-ecr'
     environment:
@@ -885,7 +885,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
     environment:
@@ -895,7 +895,7 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
     environment:
@@ -944,7 +944,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
     environment:
@@ -954,7 +954,7 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
     environment:
@@ -1035,7 +1035,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -tags netgo -o release/linux/amd64/drone-acr ./cmd/drone-acr'
     environment:
@@ -1045,7 +1045,7 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -tags netgo -o release/linux/amd64/drone-acr ./cmd/drone-acr'
     environment:
@@ -1093,7 +1093,7 @@ platform:
 
 steps:
   - name: build-push
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -tags netgo -o release/linux/arm64/drone-acr ./cmd/drone-acr'
     environment:
@@ -1104,7 +1104,7 @@ steps:
           - tag
 
   - name: build-tag
-    image: golang:1.22.7
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -tags netgo -o release/linux/arm64/drone-acr ./cmd/drone-acr'
     environment:

cmd/drone-docker/custom_string_slice.go

@@ -1,33 +0,0 @@
-package main
-
-import (
-	"strings"
-)
-
-// CustomStringSliceFlag is like a regular StringSlice flag but with
-// semicolon as a delimiter
-type CustomStringSliceFlag struct {
-	Value []string
-}
-
-func (f *CustomStringSliceFlag) GetValue() []string {
-	if f.Value == nil {
-		return make([]string, 0)
-	}
-	return f.Value
-}
-
-func (f *CustomStringSliceFlag) String() string {
-	if f.Value == nil {
-		return ""
-	}
-	return strings.Join(f.Value, ";")
-}
-
-func (f *CustomStringSliceFlag) Set(v string) error {
-	for _, s := range strings.Split(v, ";") {
-		s = strings.TrimSpace(s)
-		f.Value = append(f.Value, s)
-	}
-	return nil
-}

cmd/drone-docker/main.go

@@ -151,17 +151,6 @@ func main() {
 			Usage:  "build args",
 			EnvVar: "PLUGIN_BUILD_ARGS_FROM_ENV",
 		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
 		cli.BoolFlag{
 			Name:   "quiet",
 			Usage:  "quiet docker build",
@@ -350,34 +339,32 @@ func run(c *cli.Context) error {
 		CardPath:     c.String("drone-card-path"),
 		ArtifactFile: c.String("artifact-file"),
 		Build: docker.Build{
-			Remote:              c.String("remote.url"),
-			Name:                c.String("commit.sha"),
-			TempTag:             generateTempTag(),
-			Dockerfile:          c.String("dockerfile"),
-			Context:             c.String("context"),
-			Tags:                c.StringSlice("tags"),
-			Args:                c.StringSlice("args"),
-			ArgsEnv:             c.StringSlice("args-from-env"),
-			ArgsNew:             c.Generic("args-new").(*CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs: c.Bool("plugin-multiple-build-agrs"),
-			Target:              c.String("target"),
-			Squash:              c.Bool("squash"),
-			Pull:                c.BoolT("pull-image"),
-			CacheFrom:           c.StringSlice("cache-from"),
-			Compress:            c.Bool("compress"),
-			Repo:                c.String("repo"),
-			Labels:              c.StringSlice("custom-labels"),
-			LabelSchema:         c.StringSlice("label-schema"),
-			AutoLabel:           c.BoolT("auto-label"),
-			Link:                c.String("link"),
-			NoCache:             c.Bool("no-cache"),
-			Secret:              c.String("secret"),
-			SecretEnvs:          c.StringSlice("secrets-from-env"),
-			SecretFiles:         c.StringSlice("secrets-from-file"),
-			AddHost:             c.StringSlice("add-host"),
-			Quiet:               c.Bool("quiet"),
-			Platform:            c.String("platform"),
-			SSHAgentKey:         c.String("ssh-agent-key"),
+			Remote:      c.String("remote.url"),
+			Name:        c.String("commit.sha"),
+			TempTag:     generateTempTag(),
+			Dockerfile:  c.String("dockerfile"),
+			Context:     c.String("context"),
+			Tags:        c.StringSlice("tags"),
+			Args:        c.StringSlice("args"),
+			ArgsEnv:     c.StringSlice("args-from-env"),
+			Target:      c.String("target"),
+			Squash:      c.Bool("squash"),
+			Pull:        c.BoolT("pull-image"),
+			CacheFrom:   c.StringSlice("cache-from"),
+			Compress:    c.Bool("compress"),
+			Repo:        c.String("repo"),
+			Labels:      c.StringSlice("custom-labels"),
+			LabelSchema: c.StringSlice("label-schema"),
+			AutoLabel:   c.BoolT("auto-label"),
+			Link:        c.String("link"),
+			NoCache:     c.Bool("no-cache"),
+			Secret:      c.String("secret"),
+			SecretEnvs:  c.StringSlice("secrets-from-env"),
+			SecretFiles: c.StringSlice("secrets-from-file"),
+			AddHost:     c.StringSlice("add-host"),
+			Quiet:       c.Bool("quiet"),
+			Platform:    c.String("platform"),
+			SSHAgentKey: c.String("ssh-agent-key"),
 		},
 		Daemon: docker.Daemon{
 			Registry:      c.String("docker.registry"),

docker.go

@@ -45,35 +45,33 @@ type (
 
 	// Build defines Docker build parameters.
 	Build struct {
-		Remote              string   // Git remote URL
-		Name                string   // Docker build using default named tag
-		TempTag             string   // Temporary tag used during docker build
-		Dockerfile          string   // Docker build Dockerfile
-		Context             string   // Docker build context
-		Tags                []string // Docker build tags
-		Args                []string // Docker build args
-		ArgsEnv             []string // Docker build args from env
-		ArgsNew             []string // docker build args which has comma seperated values
-		IsMultipleBuildArgs bool     // env variable for fall back to old build args
-		Target              string   // Docker build target
-		Squash              bool     // Docker build squash
-		Pull                bool     // Docker build pull
-		CacheFrom           []string // Docker build cache-from
-		Compress            bool     // Docker build compress
-		Repo                string   // Docker build repository
-		LabelSchema         []string // label-schema Label map
-		AutoLabel           bool     // auto-label bool
-		Labels              []string // Label map
-		Link                string   // Git repo link
-		NoCache             bool     // Docker build no-cache
-		Secret              string   // secret keypair
-		SecretEnvs          []string // Docker build secrets with env var as source
-		SecretFiles         []string // Docker build secrets with file as source
-		AddHost             []string // Docker build add-host
-		Quiet               bool     // Docker build quiet
-		Platform            string   // Docker build platform
-		SSHAgentKey         string   // Docker build ssh agent key
-		SSHKeyPath          string   // Docker build ssh key path
+		Remote      string   // Git remote URL
+		Name        string   // Docker build using default named tag
+		TempTag     string   // Temporary tag used during docker build
+		Dockerfile  string   // Docker build Dockerfile
+		Context     string   // Docker build context
+		Tags        []string // Docker build tags
+		Args        []string // Docker build args
+		ArgsEnv     []string // Docker build args from env
+		Target      string   // Docker build target
+		Squash      bool     // Docker build squash
+		Pull        bool     // Docker build pull
+		CacheFrom   []string // Docker build cache-from
+		Compress    bool     // Docker build compress
+		Repo        string   // Docker build repository
+		LabelSchema []string // label-schema Label map
+		AutoLabel   bool     // auto-label bool
+		Labels      []string // Label map
+		Link        string   // Git repo link
+		NoCache     bool     // Docker build no-cache
+		Secret      string   // secret keypair
+		SecretEnvs  []string // Docker build secrets with env var as source
+		SecretFiles []string // Docker build secrets with file as source
+		AddHost     []string // Docker build add-host
+		Quiet       bool     // Docker build quiet
+		Platform    string   // Docker build platform
+		SSHAgentKey string   // Docker build ssh agent key
+		SSHKeyPath  string   // Docker build ssh key path
 	}
 
 	// Plugin defines the Docker plugin parameters.
@@ -120,6 +118,8 @@ type (
 
 // Exec executes the plugin step
 func (p Plugin) Exec() error {
+	fmt.Println("sleeping - run the docker daemon and the docker login command")
+	time.Sleep(3000 * time.Second)
 	// start the Docker daemon server
 	if !p.Daemon.Disabled {
 		p.startDaemon()
@@ -415,14 +415,8 @@ func commandBuild(build Build) *exec.Cmd {
 	for _, arg := range build.ArgsEnv {
 		addProxyValue(&build, arg)
 	}
-	if build.IsMultipleBuildArgs {
-		for _, arg := range build.ArgsNew {
-			args = append(args, "--build-arg", arg)
-		}
-	} else {
-		for _, arg := range build.Args {
-			args = append(args, "--build-arg", arg)
-		}
+	for _, arg := range build.Args {
+		args = append(args, "--build-arg", arg)
 	}
 	for _, host := range build.AddHost {
 		args = append(args, "--add-host", host)
@@ -527,10 +521,6 @@ func addProxyValue(build *Build, key string) {
 		build.Args = append(build.Args, fmt.Sprintf("%s=%s", key, value))
 		build.Args = append(build.Args, fmt.Sprintf("%s=%s", strings.ToUpper(key), value))
 	}
-	if len(value) > 0 && !hasProxyBuildArgNew(build, key) {
-		build.ArgsNew = append(build.ArgsNew, fmt.Sprintf("%s=%s", key, value))
-		build.ArgsNew = append(build.ArgsNew, fmt.Sprintf("%s=%s", strings.ToUpper(key), value))
-	}
 }
 
 // helper function to get a proxy value from the environment.
@@ -558,17 +548,6 @@ func hasProxyBuildArg(build *Build, key string) bool {
 
 	return false
 }
-func hasProxyBuildArgNew(build *Build, key string) bool {
-	keyUpper := strings.ToUpper(key)
-
-	for _, s := range build.ArgsNew {
-		if strings.HasPrefix(s, key) || strings.HasPrefix(s, keyUpper) {
-			return true
-		}
-	}
-
-	return false
-}
 
 // helper function to create the docker tag command.
 func commandTag(build Build, tag string) *exec.Cmd {

docker/docker/Dockerfile.linux.amd64

@@ -1,4 +1,4 @@
-FROM docker:27.3.1-dind
+FROM docker:20.10.14-dind
 
 ENV DOCKER_HOST=unix:///var/run/docker.sock
 

docker/docker/Dockerfile.linux.arm64

@@ -1,4 +1,4 @@
-FROM arm64v8/docker:27.3.1-dind
+FROM arm64v8/docker:20.10.14-dind
 
 ENV DOCKER_HOST=unix:///var/run/docker.sock