cleanup codebase

.drone.yml

@@ -40,7 +40,7 @@ trigger:
 ---
 kind: pipeline
 type: ssh
-name: windows-1809-docker
+name: windows-1809
 
 platform:
   os: windows
@@ -53,197 +53,90 @@ server:
     from_secret: windows_username
 
 steps:
-- name: build_latest
+- name: build-docker
+  commands:
+  - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1809-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1809-amd64"
+    }
+    docker build -f docker/docker/Dockerfile.windows.1809 -t plugins/docker:$tag .
+    docker push plugins/docker:$tag
   environment:
-    VERSION: 1809
+    CGO_ENABLED: "0"
-    REGISTRY: docker
     USERNAME:
       from_secret: docker_username
     PASSWORD:
       from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
 
-- name: build_tag
+- name: build-gcr
+  commands:
+  - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1809-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1809-amd64"
+    }
+    docker build -f docker/gcr/Dockerfile.windows.1809 -t plugins/gcr:$tag .
+    docker push plugins/gcr:$tag
   environment:
-    VERSION: 1809
+    CGO_ENABLED: "0"
-    REGISTRY: docker
     USERNAME:
       from_secret: docker_username
     PASSWORD:
       from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
 
-depends_on:
+- name: build-ecr
-  - testing
+  commands:
+  - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1809-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1809-amd64"
+    }
+    docker build -f docker/ecr/Dockerfile.windows.1809 -t plugins/ecr:$tag .
+    docker push plugins/ecr:$tag
+  environment:
+    CGO_ENABLED: "0"
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+- name: build-acr
+  commands:
+  - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1809-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1809-amd64"
+    }
+    docker build -f docker/acr/Dockerfile.windows.1809 -t plugins/acr:$tag .
+    docker push plugins/acr:$tag
+  environment:
+    CGO_ENABLED: "0"
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
 
 trigger:
-  ref:
+  event:
-  - refs/heads/master
+  - push
-  - refs/tags/*
+  - tag
+
+depends_on:
+- testing
 
 ---
 kind: pipeline
 type: ssh
-name: windows-1809-ecr
+name: windows-1909
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-docker
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1809-gcr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-ecr
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1809-acr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-gcr
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1909-docker
 
 platform:
   os: windows
@@ -256,190 +149,86 @@ server:
     from_secret: windows_username
 
 steps:
-- name: build_latest
+- name: build-docker
+  commands:
+  - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1909-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1909-amd64"
+    }
+    docker build -f docker/docker/Dockerfile.windows.1909 -t plugins/docker:$tag .
+    docker push plugins/docker:$tag
   environment:
-    VERSION: 1909
+    CGO_ENABLED: "0"
-    REGISTRY: docker
     USERNAME:
       from_secret: docker_username
     PASSWORD:
       from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
 
-- name: build_tag
+- name: build-gcr
+  commands:
+  - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1909-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1909-amd64"
+    }
+    docker build -f docker/gcr/Dockerfile.windows.1909 -t plugins/gcr:$tag .
+    docker push plugins/gcr:$tag
   environment:
-    VERSION: 1909
+    CGO_ENABLED: "0"
-    REGISTRY: docker
     USERNAME:
       from_secret: docker_username
     PASSWORD:
       from_secret: docker_password
+
+- name: build-ecr
   commands:
-  - powershell.exe scripts/windows/tag.ps1
+  - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr
-  when:
+  - docker login -u $env:USERNAME -p $env:PASSWORD
-    event: [ tag ]
+  - |
+    $tag="windows-1909-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1909-amd64"
+    }
+    docker build -f docker/ecr/Dockerfile.windows.1909 -t plugins/ecr:$tag .
+    docker push plugins/ecr:$tag
+  environment:
+    CGO_ENABLED: "0"
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+- name: build-acr
+  commands:
+  - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr
+  - docker login -u $env:USERNAME -p $env:PASSWORD
+  - |
+    $tag="windows-1909-amd64"
+    if (Test-Path env:DRONE_SEMVER_SHORT) {
+      $tag="$env:DRONE_SEMVER_SHORT-windows-1909-amd64"
+    }
+    docker build -f docker/acr/Dockerfile.windows.1909 -t plugins/acr:$tag .
+    docker push plugins/acr:$tag
+  environment:
+    CGO_ENABLED: "0"
+    USERNAME:
+      from_secret: docker_username
+    PASSWORD:
+      from_secret: docker_password
+
+trigger:
+  event:
+    - push
+    - tag
 
 depends_on:
   - testing
 
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1909-ecr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1909-gcr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
----
-kind: pipeline
-type: ssh
-name: windows-1909-acr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
-- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
 ---
 kind: pipeline
 name: linux-amd64-docker
@@ -655,8 +444,8 @@ trigger:
   - "refs/tags/**"
 
 depends_on:
-- windows-1809-docker
+- windows-1809
-- windows-1909-docker
+- windows-1909
 - linux-amd64-docker
 - linux-arm64-docker
 - linux-arm-docker
@@ -861,8 +650,8 @@ trigger:
   - "refs/tags/**"
 
 depends_on:
-- windows-1809-gcr
+- windows-1809
-- windows-1909-gcr
+- windows-1909
 - linux-amd64-gcr
 - linux-arm64-gcr
 - linux-arm-gcr
@@ -1067,8 +856,8 @@ trigger:
   - "refs/tags/**"
 
 depends_on:
-- windows-1809-ecr
+- windows-1809
-- windows-1909-ecr
+- windows-1909
 - linux-amd64-ecr
 - linux-arm64-ecr
 - linux-arm-ecr
@@ -1476,10 +1265,11 @@ trigger:
   - "refs/tags/**"
 
 depends_on:
-- windows-1809-acr
+- windows-1809
-- windows-1909-acr
+- windows-1909
 - linux-amd64-acr
 - linux-arm64-acr
 - linux-arm-acr
 
+
 ...

CHANGELOG.md

@@ -1,39 +1,11 @@
 # Changelog
 
-## [v20.11.0](https://github.com/drone-plugins/drone-docker/tree/v20.11.0) (2022-01-19)
+## [v20.10.9](https://github.com/drone-plugins/drone-docker/tree/v20.10.9) (2021-11-02)
-
-[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.10.9.1...v20.11.0)
-
-**Merged pull requests:**
-
-- \(feat\) publish docker data to create drone card [\#347](https://github.com/drone-plugins/drone-docker/pull/347) ([eoinmcafee00](https://github.com/eoinmcafee00))
-
-## [v20.10.9.1](https://github.com/drone-plugins/drone-docker/tree/v20.10.9.1) (2022-01-13)
-
-[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.10.9...v20.10.9.1)
-
-**Implemented enhancements:**
-
-- Serialize windows 1809 pipelines [\#348](https://github.com/drone-plugins/drone-docker/pull/348) ([shubham149](https://github.com/shubham149))
-- Support for windows images for tags [\#346](https://github.com/drone-plugins/drone-docker/pull/346) ([shubham149](https://github.com/shubham149))
-
-**Fixed bugs:**
-
-- Fix ECR & GCR docker publish on windows [\#352](https://github.com/drone-plugins/drone-docker/pull/352) ([shubham149](https://github.com/shubham149))
-- Fix windows docker builds [\#351](https://github.com/drone-plugins/drone-docker/pull/351) ([shubham149](https://github.com/shubham149))
-- Fix powershell script to publish windows images [\#350](https://github.com/drone-plugins/drone-docker/pull/350) ([shubham149](https://github.com/shubham149))
-
-**Merged pull requests:**
-
-- release prep for 20.10.9.1 [\#353](https://github.com/drone-plugins/drone-docker/pull/353) ([eoinmcafee00](https://github.com/eoinmcafee00))
-
-## [v20.10.9](https://github.com/drone-plugins/drone-docker/tree/v20.10.9) (2021-11-03)
 
 [Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v19.03.9...v20.10.9)
 
 **Merged pull requests:**
 
-- bump to version 20.10.9: [\#342](https://github.com/drone-plugins/drone-docker/pull/342) ([eoinmcafee00](https://github.com/eoinmcafee00))
 - Upgrade Docker dind to 20.10.9 for 64bit platforms [\#334](https://github.com/drone-plugins/drone-docker/pull/334) ([gzm0](https://github.com/gzm0))
 
 ## [v19.03.9](https://github.com/drone-plugins/drone-docker/tree/v19.03.9) (2021-10-13)

card.go

@@ -1,63 +0,0 @@
-package docker
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"time"
-
-	"github.com/drone/drone-go/drone"
-
-	"github.com/inhies/go-bytesize"
-)
-
-func (p Plugin) writeCard() error {
-	cmd := exec.Command("docker", "inspect", p.Build.Name)
-	data, err := cmd.CombinedOutput()
-	if err != nil {
-		return err
-	}
-
-	out := Inspect{}
-	if err := json.Unmarshal(data, &out); err != nil {
-		return err
-	}
-
-	inspect := out[0]
-	inspect.SizeString = fmt.Sprint(bytesize.New(float64(inspect.Size)))
-	inspect.VirtualSizeString = fmt.Sprint(bytesize.New(float64(inspect.VirtualSize)))
-	inspect.Time = fmt.Sprint(inspect.Metadata.LastTagTime.Format(time.RFC3339))
-	cardData, _ := json.Marshal(inspect)
-
-	card := drone.CardInput{
-		Schema: "https://drone-plugins.github.io/drone-docker/card.json",
-		Data:   cardData,
-	}
-
-	writeCard(p.CardPath, &card)
-	return nil
-}
-
-func writeCard(path string, card interface{}) {
-	data, _ := json.Marshal(card)
-	switch {
-	case path == "/dev/stdout":
-		writeCardTo(os.Stdout, data)
-	case path == "/dev/stderr":
-		writeCardTo(os.Stderr, data)
-	case path != "":
-		ioutil.WriteFile(path, data, 0644)
-	}
-}
-
-func writeCardTo(out io.Writer, data []byte) {
-	encoded := base64.StdEncoding.EncodeToString(data)
-	io.WriteString(out, "\u001B]1338;")
-	io.WriteString(out, encoded)
-	io.WriteString(out, "\u001B]0m")
-	io.WriteString(out, "\n")
-}

cmd/drone-acr/main.go

@@ -7,9 +7,6 @@ import (
 	"strings"
 
 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
-
-	docker "github.com/drone-plugins/drone-docker"
 )
 
 func main() {
@@ -43,12 +40,12 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)
 
 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()
 	if err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }
 

cmd/drone-docker/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"os"
-	"runtime"
 
 	"github.com/joho/godotenv"
 	"github.com/sirupsen/logrus"
@@ -249,11 +248,6 @@ func main() {
 			Usage:  "additional host:IP mapping",
 			EnvVar: "PLUGIN_ADD_HOST",
 		},
-		cli.StringFlag{
-			Name:   "drone-card-path",
-			Usage:  "card path location to write to",
-			EnvVar: "DRONE_CARD_PATH",
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -272,28 +266,27 @@ func run(c *cli.Context) error {
 			Email:    c.String("docker.email"),
 			Config:   c.String("docker.config"),
 		},
-		CardPath: c.String("drone-card-path"),
 		Build: docker.Build{
-			Remote:      c.String("remote.url"),
+			Remote:        c.String("remote.url"),
-			Name:        c.String("commit.sha"),
+			Name:          c.String("commit.sha"),
-			Dockerfile:  c.String("dockerfile"),
+			Dockerfile:    c.String("dockerfile"),
-			Context:     c.String("context"),
+			Context:       c.String("context"),
-			Tags:        c.StringSlice("tags"),
+			Tags:          c.StringSlice("tags"),
-			Args:        c.StringSlice("args"),
+			Args:          c.StringSlice("args"),
-			ArgsEnv:     c.StringSlice("args-from-env"),
+			ArgsEnv:       c.StringSlice("args-from-env"),
-			Target:      c.String("target"),
+			Target:        c.String("target"),
-			Squash:      c.Bool("squash"),
+			Squash:        c.Bool("squash"),
-			Pull:        c.BoolT("pull-image"),
+			Pull:          c.BoolT("pull-image"),
-			CacheFrom:   c.StringSlice("cache-from"),
+			CacheFrom:     c.StringSlice("cache-from"),
-			Compress:    c.Bool("compress"),
+			Compress:      c.Bool("compress"),
-			Repo:        c.String("repo"),
+			Repo:          c.String("repo"),
-			Labels:      c.StringSlice("custom-labels"),
+			Labels:        c.StringSlice("custom-labels"),
-			LabelSchema: c.StringSlice("label-schema"),
+			LabelSchema:   c.StringSlice("label-schema"),
-			AutoLabel:   c.BoolT("auto-label"),
+			AutoLabel:     c.BoolT("auto-label"),
-			Link:        c.String("link"),
+			Link:          c.String("link"),
-			NoCache:     c.Bool("no-cache"),
+			NoCache:       c.Bool("no-cache"),
-			AddHost:     c.StringSlice("add-host"),
+			AddHost:       c.StringSlice("add-host"),
-			Quiet:       c.Bool("quiet"),
+			Quiet:         c.Bool("quiet"),
 		},
 		Daemon: docker.Daemon{
 			Registry:      c.String("docker.registry"),
@@ -334,11 +327,3 @@ func run(c *cli.Context) error {
 
 	return plugin.Exec()
 }
-
-func GetExecCmd() string {
-	if runtime.GOOS == "windows" {
-		return "C:/bin/drone-docker.exe"
-	}
-
-	return "drone-docker"
-}

cmd/drone-ecr/main.go

@@ -11,15 +11,12 @@ import (
 	"strings"
 
 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ecr"
-
-	docker "github.com/drone-plugins/drone-docker"
 )
 
 const defaultRegion = "us-east-1"
@@ -113,11 +110,11 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)
 
 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err = cmd.Run(); err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }
 

cmd/drone-gcr/main.go

@@ -8,9 +8,6 @@ import (
 	"strings"
 
 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
-
-	docker "github.com/drone-plugins/drone-docker"
 )
 
 // gcr default username
@@ -57,12 +54,12 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)
 
 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }
 

docker.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 )
@@ -64,34 +63,11 @@ type (
 
 	// Plugin defines the Docker plugin parameters.
 	Plugin struct {
-		Login    Login  // Docker login configuration
+		Login   Login  // Docker login configuration
-		Build    Build  // Docker build configuration
+		Build   Build  // Docker build configuration
-		Daemon   Daemon // Docker daemon configuration
+		Daemon  Daemon // Docker daemon configuration
-		Dryrun   bool   // Docker push is skipped
+		Dryrun  bool   // Docker push is skipped
-		Cleanup  bool   // Docker purge is enabled
+		Cleanup bool   // Docker purge is enabled
-		CardPath string // Card path to write file to
-	}
-
-	Inspect []struct {
-		ID            string        `json:"Id"`
-		RepoTags      []string      `json:"RepoTags"`
-		RepoDigests   []interface{} `json:"RepoDigests"`
-		Parent        string        `json:"Parent"`
-		Comment       string        `json:"Comment"`
-		Created       time.Time     `json:"Created"`
-		Container     string        `json:"Container"`
-		DockerVersion string        `json:"DockerVersion"`
-		Author        string        `json:"Author"`
-		Architecture  string        `json:"Architecture"`
-		Os            string        `json:"Os"`
-		Size          int           `json:"Size"`
-		VirtualSize   int           `json:"VirtualSize"`
-		Metadata      struct {
-			LastTagTime time.Time `json:"LastTagTime"`
-		} `json:"Metadata"`
-		SizeString        string
-		VirtualSizeString string
-		Time              string
 	}
 )
 
@@ -180,6 +156,11 @@ func (p Plugin) Exec() error {
 		}
 	}
 
+	if p.Cleanup {
+		cmds = append(cmds, commandRmi(p.Build.Name)) // docker rmi
+		cmds = append(cmds, commandPrune())           // docker system prune -f
+	}
+
 	// execute all commands in batch mode.
 	for _, cmd := range cmds {
 		cmd.Stdout = os.Stdout
@@ -198,26 +179,6 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-	// output the adaptive card
-	if err := p.writeCard(); err != nil {
-		fmt.Printf("Could not create adaptive card. %s\n", err)
-	}
-
-	// execute cleanup routines in batch mode
-	if p.Cleanup {
-		// clear the slice
-		cmds = nil
-
-		cmds = append(cmds, commandRmi(p.Build.Name)) // docker rmi
-		cmds = append(cmds, commandPrune())           // docker system prune -f
-
-		for _, cmd := range cmds {
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			trace(cmd)
-		}
-	}
-
 	return nil
 }
 
@@ -455,11 +416,3 @@ func commandRmi(tag string) *exec.Cmd {
 func trace(cmd *exec.Cmd) {
 	fmt.Fprintf(os.Stdout, "+ %s\n", strings.Join(cmd.Args, " "))
 }
-
-func GetDroneDockerExecCmd() string {
-	if runtime.GOOS == "windows" {
-		return "C:/bin/drone-docker.exe"
-	}
-
-	return "drone-docker"
-}

docs/card.json

@@ -1,118 +0,0 @@
-{
-  "type": "AdaptiveCard",
-  "body": [
-    {
-      "type": "ColumnSet",
-      "columns": [
-        {
-          "type": "Column",
-          "items": [
-            {
-              "type": "Image",
-              "url": "https://d36jcksde1wxzq.cloudfront.net/be7833db9bddb4494d2a7c3dd659199a.png",
-              "size": "Medium"
-            }
-          ],
-          "width": "auto"
-        },
-        {
-          "type": "Column",
-          "items": [
-            {
-              "type": "TextBlock",
-              "text": "${RepoTags[0]}",
-              "size": "Medium"
-            },
-            {
-              "type": "TextBlock",
-              "text": "DIGEST: ${RepoDigests[0]}",
-              "wrap": true,
-              "size": "Small",
-              "weight": "Lighter",
-              "isSubtle": true,
-              "spacing": "Small"
-            },
-            {
-              "type": "ColumnSet",
-              "columns": [
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "OS/ARCH",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true,
-                      "spacing": "Medium"
-                    },
-                    {
-                      "type": "TextBlock",
-                      "text": "${OS}/${Architecture}",
-                      "wrap": true,
-                      "size": "Small",
-                      "spacing": "Small"
-                    }
-                  ],
-                  "separator": true,
-                  "width": "auto"
-                },
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "SIZE",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true
-                    },
-                    {
-                      "type": "TextBlock",
-                      "spacing": "Small",
-                      "text": "${SizeString}",
-                      "wrap": true,
-                      "size": "Small"
-                    }
-                  ],
-                  "width": "auto",
-                  "separator": true,
-                  "spacing": "Medium"
-                },
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "LAST PUSHED",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true
-                    },
-                    {
-                      "type": "TextBlock",
-                      "spacing": "Small",
-                      "text": "{{DATE(${Time})}} - {{TIME(${Time})}}",
-                      "wrap": true,
-                      "size": "Small"
-                    }
-                  ],
-                  "width": "auto",
-                  "separator": true,
-                  "spacing": "Medium"
-                }
-              ],
-              "style": "default"
-            }
-          ],
-          "width": "stretch"
-        }
-      ]
-    }
-  ],
-  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-  "version": "1.0"
-}

go.mod

@@ -3,8 +3,6 @@ module github.com/drone-plugins/drone-docker
 require (
 	github.com/aws/aws-sdk-go v1.26.7
 	github.com/coreos/go-semver v0.3.0
-	github.com/drone/drone-go v1.7.1
-	github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743
 	github.com/joho/godotenv v1.3.0
 	github.com/sirupsen/logrus v1.3.0
 	github.com/urfave/cli v1.22.2

go.sum

@@ -1,4 +1,3 @@
-github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e/go.mod h1:Xa6lInWHNQnuWoF0YPSsx+INFA9qk7/7pTjwb3PInkY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/aws/aws-sdk-go v1.26.7 h1:ObjEnmzvSdYy8KVd3me7v/UMyCn81inLy2SyoIPoBkg=
 github.com/aws/aws-sdk-go v1.26.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -8,12 +7,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/drone/drone-go v1.7.1 h1:ZX+3Rs8YHUSUQ5mkuMLmm1zr1ttiiE2YGNxF3AnyDKw=
-github.com/drone/drone-go v1.7.1/go.mod h1:fxCf9jAnXDZV1yDr0ckTuWd1intvcQwfJmTRpTZ1mXg=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743 h1:X3Xxno5Ji8idrNiUoFc7QyXpqhSYlDRYQmc7mlpMBzU=
-github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743/go.mod h1:KrtyD5PFj++GKkFS/7/RRrfnRhAMGQwy75GLCHWrCNs=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=

scripts/windows/latest.ps1

@@ -1,35 +0,0 @@
-# this script is used by the continuous integration server to
-# build and publish the docker image for a commit to master.
-$ErrorActionPreference = "Stop"
-
-$env:GOOS="windows"
-$env:GOARCH="amd64"
-$env:CGO_ENABLED="0"
-
-if (-not (Test-Path env:VERSION)) {
-    $env:VERSION="1809"
-}
-
-if (-not (Test-Path env:REGISTRY)) {
-    $env:REGISTRY="docker"
-}
-
-echo $env:GOOS
-echo $env:GOARCH
-echo $env:VERSION
-echo $env:REGISTRY
-
-# build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}";
-go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}
-
-# build and publish the docker image
-docker login -u ${env:USERNAME} -p ${env:PASSWORD}
-Write-Host "+ docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64 .";
-docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64 .
-Write-Host "+ docker push plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64"
-docker push plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64
-
-# remove images from local cache
-Write-Host "+ docker rmi plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64"
-docker rmi plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64

scripts/windows/tag.ps1

@@ -1,66 +0,0 @@
-# this script is used by the continuous integration server to
-# build and publish the docker image for a tagged revsision.
-$ErrorActionPreference = "Stop"
-
-$env:GOOS="windows"
-$env:GOARCH="amd64"
-$env:CGO_ENABLED="0"
-
-if (-not (Test-Path env:VERSION)) {
-    $env:VERSION="1809"
-}
-
-if (-not (Test-Path env:DRONE_SEMVER_SHORT)) {
-    echo "missing semver"
-    exit 1
-}
-
-if (-not (Test-Path env:REGISTRY)) {
-    $env:REGISTRY="docker"
-}
-
-# define the image tags
-$env:IMAGE_PATCH="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_SHORT}-windows-${env:VERSION}-amd64"
-$env:IMAGE_MAJOR="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_MAJOR}-windows-${env:VERSION}-amd64"
-$env:IMAGE_MINOR="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_MAJOR}.${env:DRONE_SEMVER_MINOR}-windows-${env:VERSION}-amd64"
-
-echo "build environment:"
-echo $env:GOOS
-echo $env:GOARCH
-echo $env:VERSION
-
-# build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}"
-go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}
-
-# authenticate with the docker registry
-docker login -u ${env:USERNAME} -p ${env:PASSWORD}
-
-echo "building images:"
-echo ${env:IMAGE_PATCH}
-echo ${env:IMAGE_MINOR}
-echo ${env:IMAGE_MAJOR}
-
-# build and tag the docker images
-Write-Host "+ docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t ${env:IMAGE_PATCH} ."
-docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t ${env:IMAGE_PATCH} .
-Write-Host "+ docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MAJOR}"
-docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MAJOR}
-Write-Host "+ docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MINOR}"
-docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MINOR}
-
-# publish the docker images
-Write-Host "+ docker push ${env:IMAGE_MAJOR}"
-docker push ${env:IMAGE_MAJOR}
-Write-Host "+ docker push ${env:IMAGE_MINOR}"
-docker push ${env:IMAGE_MINOR}
-Write-Host "+ docker push ${env:IMAGE_PATCH}"
-docker push ${env:IMAGE_PATCH}
-
-# remove images after from local cache
-Write-Host "+ docker rmi ${env:IMAGE_MAJOR}"
-docker rmi ${env:IMAGE_MAJOR}
-Write-Host "+ docker rmi ${env:IMAGE_MINOR}"
-docker rmi ${env:IMAGE_MINOR}
-Write-Host "+ docker rmi ${env:IMAGE_PATCH}"
-docker rmi ${env:IMAGE_PATCH}