Add plugin support for drone-buildx

Author: rutvijmehta-harness

.drone.yml

@@ -992,3 +992,56 @@ depends_on:
   - windows-ltsc2022
   - linux-amd64-acr
   - linux-arm64-acr
+---
+
+kind: pipeline
+name: release-binaries
+type: vm
+
+pool:
+  use: ubuntu
+
+steps:
+  - name: build
+    pull: always
+    image: golang:1.19
+    commands:
+      - GOOS=linux   GOARCH=amd64   go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-amd64 ./cmd/drone-docker
+      - GOOS=linux   GOARCH=arm64   go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-arm64 ./cmd/drone-docker
+      - GOOS=darwin  GOARCH=amd64   go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-darwin-amd64 ./cmd/drone-docker
+      - GOOS=darwin  GOARCH=arm64   go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-darwin-arm64 ./cmd/drone-docker
+      - GOOS=windows GOARCH=amd64   go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-windows-amd64.exe ./cmd/drone-docker
+
+    environment:
+      CGO_ENABLED: 0
+      GO111MODULE: on
+
+  - name: zstd-compress
+    commands:
+      - sudo apt-get update -y
+      - sudo apt-get install -y zstd
+      - zstd release/drone-buildx-linux-amd64
+      - zstd release/drone-buildx-linux-arm64
+      - zstd release/drone-buildx-darwin-arm64
+      - zstd release/drone-buildx-darwin-amd64
+      - zstd release/drone-buildx-windows-amd64.exe
+
+  - name: release
+    image: plugins/github-release
+    settings:
+      files:
+        - release/drone-buildx-linux-amd64.zst
+        - release/drone-buildx-linux-arm64.zst
+        - release/drone-buildx-darwin-arm64.zst
+        - release/drone-buildx-darwin-amd64.zst
+        - release/drone-buildx-windows-amd64.exe.zst
+      api_key:
+        from_secret: github_token
+    when:
+      event:
+        - tag
+depends_on:
+  - windows-1809
+  - windows-ltsc2022
+  - linux-amd64-docker
+  - linux-arm64-docker

daemon.go

@@ -8,7 +8,7 @@ import (
 	"os"
 )
 
-const dockerExe = "/usr/bin/docker"
+const dockerExe = "docker"
 const dockerdExe = "/usr/bin/dockerd"
 const dockerHome = "/root/.docker/"
 

docker_test.go

@@ -6,11 +6,13 @@ import (
 	"testing"
 )
 
-func TestCommandBuild(t *testing.T) {
+func TestCommandBuildx(t *testing.T) {
 	tcs := []struct {
-		name  string
-		build Build
-		want  *exec.Cmd
+		name    string
+		build   Build
+		builder Builder
+		dryrun  bool
+		want    *exec.Cmd
 	}{
 		{
 			name: "secret from env var",
@@ -21,15 +23,19 @@ func TestCommandBuild(t *testing.T) {
 				SecretEnvs: []string{
 					"foo_secret=FOO_SECRET_ENV_VAR",
 				},
+				Repo: "plugins/drone-docker",
+				Tags: []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 				"--secret id=foo_secret,env=FOO_SECRET_ENV_VAR",
 			),
@@ -43,15 +49,19 @@ func TestCommandBuild(t *testing.T) {
 				SecretFiles: []string{
 					"foo_secret=/path/to/foo_secret",
 				},
+				Repo: "plugins/drone-docker",
+				Tags: []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 				"--secret id=foo_secret,src=/path/to/foo_secret",
 			),
@@ -70,15 +80,19 @@ func TestCommandBuild(t *testing.T) {
 					"foo_secret=/path/to/foo_secret",
 					"bar_secret=/path/to/bar_secret",
 				},
+				Repo: "plugins/drone-docker",
+				Tags: []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 				"--secret id=foo_secret,env=FOO_SECRET_ENV_VAR",
 				"--secret id=bar_secret,env=BAR_SECRET_ENV_VAR",
@@ -102,15 +116,19 @@ func TestCommandBuild(t *testing.T) {
 					"=/path/to/bar_secret",
 					"",
 				},
+				Repo: "plugins/drone-docker",
+				Tags: []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 			),
 		},
@@ -121,15 +139,19 @@ func TestCommandBuild(t *testing.T) {
 				Dockerfile: "Dockerfile",
 				Context:    ".",
 				Platform:   "test/platform",
+				Repo:       "plugins/drone-docker",
+				Tags:       []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 				"--platform",
 				"test/platform",
@@ -142,15 +164,19 @@ func TestCommandBuild(t *testing.T) {
 				Dockerfile: "Dockerfile",
 				Context:    ".",
 				SSHKeyPath: "id_rsa=/root/.ssh/id_rsa",
+				Repo:       "plugins/drone-docker",
+				Tags:       []string{"latest"},
 			},
 			want: exec.Command(
 				dockerExe,
+				"buildx",
 				"build",
 				"--rm=true",
 				"-f",
 				"Dockerfile",
 				"-t",
 				"plugins/drone-docker:latest",
+				"--push",
 				".",
 				"--ssh id_rsa=/root/.ssh/id_rsa",
 			),
@@ -161,7 +187,7 @@ func TestCommandBuild(t *testing.T) {
 		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
-			cmd := commandBuild(tc.build)
+			cmd := commandBuildx(tc.build, tc.builder, tc.dryrun)
 
 			if !reflect.DeepEqual(cmd.String(), tc.want.String()) {
 				t.Errorf("Got cmd %v, want %v", cmd, tc.want)

plugin.yml

@@ -0,0 +1,3 @@
+run:
+  binary:
+    source: https://github.com/drone-plugins/drone-buildx/releases/download/{{ release }}/drone-buildx-{{ os }}-{{ arch }}.zst