2024-06-29 05:30:57 +02:00
23 changed files with 480 additions and 472 deletions
--- a/.dictionary
+++ b/.dictionary
@ -10,4 +10,3 @@ json
 config
 host:ip
 multiarch
-DockerHub
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
-*
-!dist/
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -1,5 +1,6 @@
 local PipelineTest = {
  kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
  name: 'test',
  platform: {
    os: 'linux',
@ -8,7 +9,7 @@ local PipelineTest = {
  steps: [
    {
      name: 'deps',
-      image: 'golang:1.19',
+      image: 'golang:1.18',
      commands: [
        'make deps',
      ],
@ -21,7 +22,7 @@ local PipelineTest = {
    },
    {
      name: 'lint',
-      image: 'golang:1.19',
+      image: 'golang:1.18',
      commands: [
        'make lint',
      ],
@ -34,7 +35,7 @@ local PipelineTest = {
    },
    {
      name: 'test',
-      image: 'golang:1.19',
+      image: 'golang:1.18',
      commands: [
        'make test',
      ],
@ -60,6 +61,7 @@ local PipelineTest = {

 local PipelineBuildBinaries = {
  kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
  name: 'build-binaries',
  platform: {
    os: 'linux',
@ -68,9 +70,8 @@ local PipelineBuildBinaries = {
  steps: [
    {
      name: 'build',
-      image: 'techknowlogick/xgo:go-1.19.x',
+      image: 'techknowlogick/xgo:go-1.18.x',
      commands: [
-        'ln -s /drone/src /source',
        'make release',
      ],
    },
@ -78,7 +79,7 @@ local PipelineBuildBinaries = {
      name: 'executable',
      image: 'alpine',
      commands: [
-        '$(find dist/ -executable -type f -iname ${DRONE_REPO_NAME}-linux-amd64) --help',
+        '$(find dist/ -executable -type f | grep drone-docker-linux-amd64) --help',
      ],
    },
    {
@ -126,6 +127,7 @@ local PipelineBuildBinaries = {

 local PipelineBuildContainer(arch='amd64') = {
  kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
  name: 'build-container-' + arch,
  platform: {
    os: 'linux',
@ -134,18 +136,21 @@ local PipelineBuildContainer(arch='amd64') = {
  steps: [
    {
      name: 'build',
-      image: 'golang:1.19',
+      image: 'golang:1.18',
      commands: [
        'make build',
      ],
    },
    {
      name: 'dryrun',
-      image: 'thegeeklab/drone-docker:20',
+      image: 'plugins/docker:19',
      settings: {
+        config: { from_secret: 'docker_config' },
        dry_run: true,
        dockerfile: 'docker/Dockerfile.' + arch,
        repo: 'thegeeklab/${DRONE_REPO_NAME}',
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
      },
      depends_on: ['build'],
      when: {
@ -154,8 +159,9 @@ local PipelineBuildContainer(arch='amd64') = {
    },
    {
      name: 'publish-dockerhub',
-      image: 'thegeeklab/drone-docker:20',
+      image: 'plugins/docker:19',
      settings: {
+        config: { from_secret: 'docker_config' },
        auto_tag: true,
        auto_tag_suffix: arch,
        dockerfile: 'docker/Dockerfile.' + arch,
@ -170,8 +176,9 @@ local PipelineBuildContainer(arch='amd64') = {
    },
    {
      name: 'publish-quay',
-      image: 'thegeeklab/drone-docker:20',
+      image: 'plugins/docker:19',
      settings: {
+        config: { from_secret: 'docker_config' },
        auto_tag: true,
        auto_tag_suffix: arch,
        dockerfile: 'docker/Dockerfile.' + arch,
@ -214,8 +221,9 @@ local PipelineDocs = {
    },
    {
      name: 'spellcheck',
-      image: 'thegeeklab/alpine-tools',
+      image: 'node:lts-alpine',
      commands: [
+        'npm install -g spellchecker-cli',
        "spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions",
      ],
      environment: {
@ -241,6 +249,7 @@ local PipelineDocs = {
    'build-binaries',
    'build-container-amd64',
    'build-container-arm64',
+    'build-container-arm',
  ],
  trigger: {
    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
@ -249,6 +258,7 @@ local PipelineDocs = {

 local PipelineNotifications = {
  kind: 'pipeline',
+  image_pull_secrets: ['docker_config'],
  name: 'notifications',
  platform: {
    os: 'linux',
@ -344,6 +354,7 @@ local PipelineNotifications = {
  PipelineBuildBinaries,
  PipelineBuildContainer(arch='amd64'),
  PipelineBuildContainer(arch='arm64'),
+  PipelineBuildContainer(arch='arm'),
  PipelineDocs,
  PipelineNotifications,
 ]
--- a/.drone.yml
+++ b/.drone.yml
@ -8,7 +8,7 @@ platform:

 steps:
  - name: deps
-    image: golang:1.19
+    image: golang:1.18
    commands:
      - make deps
    volumes:
@ -16,7 +16,7 @@ steps:
        path: /go

  - name: lint
-    image: golang:1.19
+    image: golang:1.18
    commands:
      - make lint
    volumes:
@ -24,7 +24,7 @@ steps:
        path: /go

  - name: test
-    image: golang:1.19
+    image: golang:1.18
    commands:
      - make test
    volumes:
@ -35,6 +35,9 @@ volumes:
  - name: godeps
    temp: {}

+image_pull_secrets:
+  - docker_config
+
 trigger:
  ref:
    - refs/heads/main
@ -51,15 +54,14 @@ platform:

 steps:
  - name: build
-    image: techknowlogick/xgo:go-1.19.x
+    image: techknowlogick/xgo:go-1.18.x
    commands:
-      - ln -s /drone/src /source
      - make release

  - name: executable
    image: alpine
    commands:
-      - $(find dist/ -executable -type f -iname ${DRONE_REPO_NAME}-linux-amd64) --help
+      - $(find dist/ -executable -type f | grep drone-docker-linux-amd64) --help

  - name: changelog-generate
    image: thegeeklab/git-chglog
@ -87,6 +89,9 @@ steps:
      ref:
        - refs/tags/**

+image_pull_secrets:
+  - docker_config
+
 trigger:
  ref:
    - refs/heads/main
@ -106,16 +111,22 @@ platform:

 steps:
  - name: build
-    image: golang:1.19
+    image: golang:1.18
    commands:
      - make build

  - name: dryrun
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.amd64
      dry_run: true
+      password:
+        from_secret: docker_password
      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
    when:
      ref:
        - refs/pull/**
@ -123,10 +134,12 @@ steps:
      - build

  - name: publish-dockerhub
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
      auto_tag: true
      auto_tag_suffix: amd64
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.amd64
      password:
        from_secret: docker_password
@ -141,10 +154,12 @@ steps:
      - dryrun

  - name: publish-quay
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
      auto_tag: true
      auto_tag_suffix: amd64
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.amd64
      password:
        from_secret: quay_password
@ -159,6 +174,9 @@ steps:
    depends_on:
      - dryrun

+image_pull_secrets:
+  - docker_config
+
 trigger:
  ref:
    - refs/heads/main
@ -178,16 +196,22 @@ platform:

 steps:
  - name: build
-    image: golang:1.19
+    image: golang:1.18
    commands:
      - make build

  - name: dryrun
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.arm64
      dry_run: true
+      password:
+        from_secret: docker_password
      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
    when:
      ref:
        - refs/pull/**
@ -195,10 +219,12 @@ steps:
      - build

  - name: publish-dockerhub
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
      auto_tag: true
      auto_tag_suffix: arm64
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.arm64
      password:
        from_secret: docker_password
@ -213,10 +239,12 @@ steps:
      - dryrun

  - name: publish-quay
-    image: thegeeklab/drone-docker:20
+    image: plugins/docker:19
    settings:
      auto_tag: true
      auto_tag_suffix: arm64
+      config:
+        from_secret: docker_config
      dockerfile: docker/Dockerfile.arm64
      password:
        from_secret: quay_password
@ -231,6 +259,94 @@ steps:
    depends_on:
      - dryrun

+image_pull_secrets:
+  - docker_config
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - test
+
+---
+kind: pipeline
+name: build-container-arm
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+  - name: build
+    image: golang:1.18
+    commands:
+      - make build
+
+  - name: dryrun
+    image: plugins/docker:19
+    settings:
+      config:
+        from_secret: docker_config
+      dockerfile: docker/Dockerfile.arm
+      dry_run: true
+      password:
+        from_secret: docker_password
+      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/pull/**
+    depends_on:
+      - build
+
+  - name: publish-dockerhub
+    image: plugins/docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm
+      config:
+        from_secret: docker_config
+      dockerfile: docker/Dockerfile.arm
+      password:
+        from_secret: docker_password
+      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+  - name: publish-quay
+    image: plugins/docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm
+      config:
+        from_secret: docker_config
+      dockerfile: docker/Dockerfile.arm
+      password:
+        from_secret: quay_password
+      registry: quay.io
+      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: quay_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
  ref:
    - refs/heads/main
@ -258,8 +374,9 @@ steps:
      - markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'

  - name: spellcheck
-    image: thegeeklab/alpine-tools
+    image: node:lts-alpine
    commands:
+      - npm install -g spellchecker-cli
      - spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions
    environment:
      FORCE_COLOR: true
@ -288,6 +405,7 @@ depends_on:
  - build-binaries
  - build-container-amd64
  - build-container-arm64
+  - build-container-arm

 ---
 kind: pipeline
@ -368,6 +486,9 @@ steps:
        - success
        - failure

+image_pull_secrets:
+  - docker_config
+
 trigger:
  ref:
    - refs/heads/main
@ -381,6 +502,6 @@ depends_on:

 ---
 kind: signature
-hmac: 2678272f471334df973c0b9c0e8886dcf0941f5581b460b116fb48c88e7a14ba
+hmac: 9ee9ec07028e26d74e30bb239266b01dd105621178225d50bf2a214712d816e9

 ...
--- a/.github/settings.yml
+++ b/.github/settings.yml
@ -52,17 +52,14 @@ branches:
        strict: false
        contexts:
          - continuous-integration/drone/pr
-      enforce_admins: true
-      required_linear_history: true
+      enforce_admins: null
      restrictions: null
  - name: docs
    protection:
      required_pull_request_reviews: null
      required_status_checks: null
      enforce_admins: true
-      required_linear_history: true
      restrictions:
-        apps: []
        users: []
        teams:
          - bot
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,4 @@
 /dist/
-/release/
 /drone-docker*

 coverage.out
--- a/18
+++ b/18
@ -1,7 +1,7 @@
 # renovate: datasource=github-releases depName=mvdan/gofumpt
-GOFUMPT_PACKAGE_VERSION := v0.4.0
+GOFUMPT_PACKAGE_VERSION := v0.3.1
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-GOLANGCI_LINT_PACKAGE_VERSION := v1.50.1
+GOLANGCI_LINT_PACKAGE_VERSION := v1.45.2

 EXECUTABLE := drone-docker

@ -19,8 +19,8 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest

 GENERATE ?=
-XGO_VERSION := go-1.19.x
-XGO_TARGETS ?= linux/amd64,linux/arm64
+XGO_VERSION := go-1.18.x
+XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64

 TAGS ?= netgo

@ -43,7 +43,7 @@ all: clean build

 .PHONY: clean
 clean:
-	$(GO) clean -i ./...
+	go clean -i ./...
 	rm -rf $(DIST_DIRS)

 .PHONY: fmt
@ -59,24 +59,24 @@ lint: golangci-lint

 .PHONY: generate
 generate:
-	$(GO) generate $(GENERATE)
+	go generate $(GENERATE)

 .PHONY: test
 test:
-	$(GO) test -v -coverprofile coverage.out $(PACKAGES)
+	go test -v -coverprofile coverage.out $(PACKAGES)

 .PHONY: build
 build: $(DIST)/$(EXECUTABLE)

 $(DIST)/$(EXECUTABLE): $(SOURCES)
-	$(GO) build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./cmd/$(EXECUTABLE)
+	go build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./cmd/$(EXECUTABLE)

 $(DIST_DIRS):
 	mkdir -p $(DIST_DIRS)

 .PHONY: xgo
 xgo: | $(DIST_DIRS)
-	$(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -v -ldflags '-extldflags "-static" $(LDFLAGS)' -tags '$(TAGS)' -targets '$(XGO_TARGETS)' -out $(EXECUTABLE) --pkg cmd/$(EXECUTABLE) .
+	go run $(XGO_PACKAGE) -go $(XGO_VERSION) -v -ldflags '-extldflags "-static" $(LDFLAGS)' -tags '$(TAGS)' -targets '$(XGO_TARGETS)' -out $(EXECUTABLE) --pkg cmd/$(EXECUTABLE) .
 	cp /build/* $(CWD)/$(DIST)
 	ls -l $(CWD)/$(DIST)

--- a/README.md
+++ b/README.md
@ -1,7 +1,5 @@
 # drone-docker

-> DISCONTINUED: This image is no longer maintained and will be removed in the future.
-
 Drone plugin to build multiarch Docker images

 [![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-docker?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-docker)
@ -12,15 +10,16 @@ Drone plugin to build multiarch Docker images
 [![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-docker)
 [![License: Apache-2.0](https://img.shields.io/github/license/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/blob/main/LICENSE)

-Drone plugin to build multiarch Docker images. This plugin is a fork of [drone-plugins/drone-docker](https://github.com/drone-plugins/drone-docker). You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/plugins/drone-docker).
+Drone plugin to build multiarch Docker images. This plugin is a fork of [drone-plugins/drone-docker](https://github.com/drone-plugins/drone-docker). You can find the full documentation at You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/plugins/drone-docker).

 ## Versioning

-The tags follow the major version of Docker, e.g. `19`, and the minor and patch parts reflect the `version` of the plugin. A full example would be `19.6.5`. Minor versions can introduce breaking changes, while patch versions can be considered non-breaking.
+The tags follow the major version of Docker, e.g. `19`, the minor and patch part reflects the "version" of the plugin. A full example would be `19.6.5`. Minor versions may introduce breaking changes, while patch versions may be considered non-breaking.

 ## Contributors

-Special thanks to all [contributors](https://github.com/thegeeklab/drone-docker/graphs/contributors). If you would like to contribute, please see the [instructions](https://github.com/thegeeklab/drone-docker/blob/main/CONTRIBUTING.md).
+Special thanks goes to all [contributors](https://github.com/thegeeklab/drone-docker/graphs/contributors). If you would like to contribute,
+please see the [instructions](https://github.com/thegeeklab/drone-docker/blob/main/CONTRIBUTING.md).

 ## License

--- a/_docs/_index.md
+++ b/_docs/_index.md
@ -0,0 +1,167 @@
+---
+title: drone-docker
+---
+
+[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-docker?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-docker)
+[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/drone-docker)
+[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/drone-docker)
+[![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/graphs/contributors)
+[![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-docker)
+[![License: MIT](https://img.shields.io/github/license/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/blob/main/LICENSE)
+
+Drone plugin to build and publish multiarch Docker images.
+
+<!-- prettier-ignore-start -->
+<!-- spellchecker-disable -->
+{{< toc >}}
+<!-- spellchecker-enable -->
+<!-- prettier-ignore-end -->
+
+## Versioning
+
+The tags follow the major version of Docker, e.g. `19`, the minor and patch part reflects the "version" of the plugin. A full example would be `19.6.5`. Minor versions may introduce breaking changes, while patch versions may be considered non-breaking.
+
+## Build
+
+Build the binary with the following command:
+
+```Shell
+export GOOS=linux
+export GOARCH=amd64
+export CGO_ENABLED=0
+export GO111MODULE=on
+
+go build -v -a -tags netgo -o release/amd64/drone-docker ./cmd/drone-docker/
+```
+
+Build the Docker image with the following command:
+
+```Shell
+docker build --file docker/Dockerfile.amd64 --tag thegeeklab/drone-docker .
+```
+
+## Usage
+
+{{< hint warning >}}
+**Note**\
+Be aware that the this plugin requires privileged capabilities, otherwise the
+integrated Docker daemon is not able to start.
+{{< /hint >}}
+
+```Shell
+docker run --rm \
+  -e PLUGIN_TAG=latest \
+  -e PLUGIN_REPO=octocat/hello-world \
+  -e DRONE_COMMIT_SHA=00000000 \
+  -v $(pwd):$(pwd) \
+  -w $(pwd) \
+  --privileged \
+  thegeeklab/drone-docker --dry-run
+```
+
+### Parameters
+
+dry_run
+: disables docker push
+
+drone_remote_url
+: sets the git remote url
+
+mirror
+: sets a registry mirror to pull images
+
+storage_driver
+: sets the docker daemon storage driver
+
+storage_path
+: sets the docker daemon storage path (default `/var/lib/docker`)
+
+bip
+: allows the docker daemon to bride ip address
+
+mtu
+: sets docker daemon custom mtu setting
+
+custom_dns
+: sets custom docker daemon dns server
+
+custom_dns_search
+: sets custom docker daemon dns search domain
+
+insecure
+: allows the docker daemon to use insecure registries
+
+ipv6
+: enables docker daemon ipv6 support
+
+experimental
+: enables docker daemon experimental mode
+
+debug "docker_launch_debug
+: enables verbose debug mode for the docker daemon
+
+daemon_off
+: disables the startup of the docker daemon
+
+dockerfile
+: sets dockerfile to use for the image build (default `./Dockerfile`)
+
+context
+: sets the path of the build context to use (default `./`)
+
+tags
+: sets repository tags to use for the image; tags can also be loaded from a `.tags` file (default `latest`)
+
+auto_tag
+: generates tag names automatically based on git branch and git tag
+
+auto_tag_suffix
+: generates tag names with the given suffix
+
+build_args
+: sets custom build arguments for the build
+
+build_args_from_env
+: forwards environment variables as custom arguments to the build
+
+quiet
+: enables suppression of the build output
+
+target
+: sets the build target to use
+
+cache_from
+: sets images to consider as cache sources
+
+pull_image
+: enforces to pull base image at build time (default `true`)
+
+compress
+: enables compression og the build context using gzip
+
+repo
+: sets repository name for the image
+
+registry
+: sets docker registry to authenticate with (default `https://index.docker.io/v1/`)
+
+username
+: sets username to authenticates with
+
+password
+: sets password to authenticates with
+
+email
+: sets email address to authenticates with
+
+config
+: sets content of the docker daemon json config
+
+purge
+: enables cleanup of the docker environment at the end of a build (default `true`)
+
+no_cache
+: disables the usage of cached intermediate containers
+
+add_host
+: sets additional host:ip mapping
--- a/_docs/content/_index.md
+++ b/_docs/content/_index.md
@ -1,105 +0,0 @@
---
-title: drone-docker
---
-
-[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-docker?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-docker)
-[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/drone-docker)
-[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/drone-docker)
-[![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/graphs/contributors)
-[![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-docker)
-[![License: MIT](https://img.shields.io/github/license/thegeeklab/drone-docker)](https://github.com/thegeeklab/drone-docker/blob/main/LICENSE)
-
-Drone plugin to build and publish multiarch Docker images.
-
-<!-- prettier-ignore-start -->
-<!-- spellchecker-disable -->
-{{< toc >}}
-<!-- spellchecker-enable -->
-<!-- prettier-ignore-end -->
-
-## Versioning
-
-The tags follow the major version of Docker, e.g. `19`, and the minor and patch parts reflect the `version` of the plugin. A full example would be `19.6.5`. Minor versions can introduce breaking changes, while patch versions can be considered non-breaking.
-
-## Usage
-
-{{< hint type=important >}}
-Be aware that the this plugin requires [privileged](https://docs.drone.io/pipeline/docker/syntax/steps/#privileged-mode) capabilities, otherwise the integrated Docker daemon is not able to start.
-{{< /hint >}}
-
-```YAML
-kind: pipeline
-name: default
-
-steps:
-  - name: docker
-    image: thegeeklab/drone-docker
-    privileged: true
-    settings:
-      username: octocat
-      password: secure
-      repo: octocat/example
-      tags: latest
-```
-
-### Parameters
-
-<!-- prettier-ignore-start -->
-<!-- spellchecker-disable -->
-{{< propertylist name=drone-docker.data sort=name >}}
-<!-- spellchecker-enable -->
-<!-- prettier-ignore-end -->
-
-### Examples
-
-**Push to other registries than DockerHub:**
-
-If the created image is to be pushed to registries other than the default DockerHub, it is necessary to set `registry` and `repo` as fully-qualified name.
-
-```YAML
-kind: pipeline
-name: default
-
-steps:
-  - name: docker
-    image: thegeeklab/drone-docker
-    privileged: true
-    settings:
-      registry: ghcr.io
-      username: octocat
-      password: secret-access-token
-      repo: ghcr.io/octocat/example
-      tags: latest
-```
-
-## Build
-
-Build the binary with the following command:
-
-```Shell
-export GOOS=linux
-export GOARCH=amd64
-export CGO_ENABLED=0
-export GO111MODULE=on
-
-make build
-```
-
-Build the Docker image with the following command:
-
-```Shell
-docker build --file docker/Dockerfile.amd64 --tag thegeeklab/drone-docker .
-```
-
-## Test
-
-```Shell
-docker run --rm \
-  -e PLUGIN_TAG=latest \
-  -e PLUGIN_REPO=octocat/hello-world \
-  -e DRONE_COMMIT_SHA=00000000 \
-  -v $(pwd):$(pwd) \
-  -w $(pwd) \
-  --privileged \
-  thegeeklab/drone-docker --dry-run
-```
--- a/_docs/data/data.yaml
+++ b/_docs/data/data.yaml
@ -1,197 +0,0 @@
---
-properties:
-  - name: dry_run
-    description: Disable docker push.
-    type: bool
-    required: false
-
-  - name: mirror
-    description: Use a registry mirror to pull images.
-    type: string
-    required: false
-
-  - name: storage_driver
-    description: The docker daemon storage driver.
-    type: string
-    required: false
-
-  - name: storage_path
-    description: The docker daemon storage path.
-    defaultValue: /var/lib/docker
-    type: string
-    required: false
-
-  - name: bip
-    description: Allows the docker daemon to bride IP address.
-    type: string
-    required: false
-
-  - name: mtu
-    description: A docker daemon custom MTU.
-    type: string
-    required: false
-
-  - name: custom_dns
-    description: Custom docker daemon DNS server.
-    type: list
-    required: false
-
-  - name: custom_dns_search
-    description: Custom docker daemon DNS search domain.
-    type: list
-    required: false
-
-  - name: insecure
-    description: Enable the usage of insecure registries.
-    type: bool
-    defaultValue: false
-    required: false
-
-  - name: ipv6
-    description: Enable docker daemon IPv6 support.
-    type: bool
-    defaultValue: false
-    required: false
-
-  - name: experimental
-    description: Enable docker daemon experimental mode.
-    type: bool
-    defaultValue: false
-    required: false
-
-  - name: daemon_debug
-    description: Enable verbose debug mode for the docker daemon.
-    type: string
-    defaultValue: false
-    required: false
-
-  - name: daemon_off
-    description: Disable the startup of the docker daemon.
-    type: string
-    defaultValue: false
-    required: false
-
-  - name: dockerfile
-    description: Set dockerfile to use for the image build.
-    defaultValue: Dockerfile
-    type: string
-    required: false
-
-  - name: context
-    description: Set the path of the build context to use.
-    defaultValue: .
-    type: string
-    required: false
-
-  - name: tags
-    description: Set repository tags to use for the image. Tags can also be loaded from a `.tags` file.
-    defaultValue: latest
-    type: list
-    required: false
-
-  - name: auto_tag
-    description: |
-      Generate tag names automatically based on git branch and git tag. When this feature is enabled and the event type is `tag`,
-      the plugin will automatically tag the image using the standard semVer convention. For example:
-
-      - `1.0.0` produces docker tags `1`, `1.0`, `1.0.0`
-      - `1.0.0-rc.1` produces docker tags `1.0.0-rc.1`
-
-      When the event type is `push` and the target branch is your default branch, the plugin will automatically tag the image
-      as `latest`. All other event types and branches are ignored.
-    defaultValue: false
-    type: bool
-    required: false
-
-  - name: auto_tag_suffix
-    description: Generate tag names with the given suffix.
-    type: string
-    required: false
-
-  - name: build_args
-    description: Ccustom build arguments to pass to the build.
-    type: list
-    required: false
-
-  - name: build_args_from_env
-    description: Forward environment variables as custom arguments to the build.
-    type: list
-    required: false
-
-  - name: quiet
-    description: Enable suppression of the build output.
-    defaultValue: false
-    type: bool
-    required: false
-
-  - name: target
-    description: The docker build target.
-    type: string
-    required: false
-
-  - name: cache_from
-    description: Images to consider as cache sources.
-    type: list
-    required: false
-
-  - name: pull_image
-    description: Enforce to pull the base image at build time.
-    defaultValue: true
-    type: bool
-    required: false
-
-  - name: compress
-    description: Enable compression of the build context using gzip.
-    defaultValue: false
-    type: bool
-    required: false
-
-  - name: repo
-    description: |
-      Repository name for the image. If the image is to be pushed to registries other than the default DockerHub,
-      it is necessary to set `repo` as fully-qualified name.
-    type: string
-    required: false
-
-  - name: registry
-    description: Docker registry to upload images.
-    defaultValue: https://index.docker.io/v1/
-    type: string
-    required: false
-
-  - name: username
-    description: Username for authentication with the registry.
-    type: string
-    required: false
-
-  - name: password
-    description: Password for authentication with the registry.
-    type: string
-    required: false
-
-  - name: email
-    description: E-Mail address for authentication with the registry.
-    type: string
-    required: false
-
-  - name: config
-    description: Content of the docker daemon json config.
-    type: string
-    required: false
-
-  - name: purge
-    description: Enable cleanup of the docker environment at the end of a build.
-    defaultValue: true
-    type: bool
-    required: false
-
-  - name: no_cache
-    description: Disable the usage of cached intermediate containers.
-    defaultValue: false
-    type: string
-    required: false
-
-  - name: add_host
-    description: Additional `host:ip` mapping.
-    type: list
-    required: false
--- a/cmd/drone-docker/config.go
+++ b/cmd/drone-docker/config.go
@ -6,261 +6,224 @@ import (
 )

 // settingsFlags has the cli.Flags for the plugin.Settings.
-func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
+func settingsFlags(settings *plugin.Settings) []cli.Flag {
 	return []cli.Flag{
 		&cli.BoolFlag{
 			Name:        "dry-run",
 			EnvVars:     []string{"PLUGIN_DRY_RUN"},
-			Usage:       "disable docker push",
+			Usage:       "disables docker push",
 			Destination: &settings.Dryrun,
-			Category:    category,
+		},
+		&cli.StringFlag{
+			Name:        "remote.url",
+			EnvVars:     []string{"DRONE_REMOTE_URL"},
+			Usage:       "sets the git remote url",
+			Destination: &settings.Build.Remote,
 		},
 		&cli.StringFlag{
 			Name:        "daemon.mirror",
 			EnvVars:     []string{"PLUGIN_MIRROR", "DOCKER_PLUGIN_MIRROR"},
-			Usage:       "registry mirror to pull images",
+			Usage:       "sets a registry mirror to pull images",
 			Destination: &settings.Daemon.Mirror,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "daemon.storage-driver",
 			EnvVars:     []string{"PLUGIN_STORAGE_DRIVER"},
-			Usage:       "docker daemon storage driver",
+			Usage:       "sets the docker daemon storage driver",
 			Destination: &settings.Daemon.StorageDriver,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "daemon.storage-path",
 			EnvVars:     []string{"PLUGIN_STORAGE_PATH"},
-			Usage:       "docker daemon storage path",
+			Usage:       "sets the docker daemon storage path",
 			Value:       "/var/lib/docker",
 			Destination: &settings.Daemon.StoragePath,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "daemon.bip",
 			EnvVars:     []string{"PLUGIN_BIP"},
-			Usage:       "allow the docker daemon to bride ip address",
+			Usage:       "allows the docker daemon to bride ip address",
 			Destination: &settings.Daemon.Bip,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "daemon.mtu",
 			EnvVars:     []string{"PLUGIN_MTU"},
-			Usage:       "docker daemon custom mtu setting",
+			Usage:       "sets docker daemon custom mtu setting",
 			Destination: &settings.Daemon.MTU,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "daemon.dns",
 			EnvVars:     []string{"PLUGIN_CUSTOM_DNS"},
-			Usage:       "custom docker daemon dns server",
+			Usage:       "sets custom docker daemon dns server",
 			Destination: &settings.Daemon.DNS,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "daemon.dns-search",
 			EnvVars:     []string{"PLUGIN_CUSTOM_DNS_SEARCH"},
-			Usage:       "custom docker daemon dns search domain",
+			Usage:       "sets custom docker daemon dns search domain",
 			Destination: &settings.Daemon.DNSSearch,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "daemon.insecure",
 			EnvVars:     []string{"PLUGIN_INSECURE"},
-			Usage:       "allow the docker daemon to use insecure registries",
-			Value:       false,
+			Usage:       "allows the docker daemon to use insecure registries",
 			Destination: &settings.Daemon.Insecure,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "daemon.ipv6",
 			EnvVars:     []string{"PLUGIN_IPV6"},
-			Usage:       "enable docker daemon IPv6 support",
-			Value:       false,
+			Usage:       "enables docker daemon IPv6 support",
 			Destination: &settings.Daemon.IPv6,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "daemon.experimental",
 			EnvVars:     []string{"PLUGIN_EXPERIMENTAL"},
-			Usage:       "enable docker daemon experimental mode",
-			Value:       false,
+			Usage:       "enables docker daemon experimental mode",
 			Destination: &settings.Daemon.Experimental,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "daemon.debug",
 			EnvVars:     []string{"PLUGIN_DEBUG", "DOCKER_LAUNCH_DEBUG"},
-			Usage:       "enable verbose debug mode for the docker daemon",
-			Value:       false,
+			Usage:       "enables verbose debug mode for the docker daemon",
 			Destination: &settings.Daemon.Debug,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "daemon.off",
 			EnvVars:     []string{"PLUGIN_DAEMON_OFF"},
-			Usage:       "disable the startup of the docker daemon",
-			Value:       false,
+			Usage:       "disables the startup of the docker daemon",
 			Destination: &settings.Daemon.Disabled,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "dockerfile",
 			EnvVars:     []string{"PLUGIN_DOCKERFILE"},
-			Usage:       "dockerfile to use for the image build",
+			Usage:       "sets dockerfile to use for the image build",
 			Value:       "Dockerfile",
 			Destination: &settings.Build.Dockerfile,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "context",
 			EnvVars:     []string{"PLUGIN_CONTEXT"},
-			Usage:       "path of the build context",
+			Usage:       "sets the path of the build context to use",
 			Value:       ".",
 			Destination: &settings.Build.Context,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "tags",
 			EnvVars:     []string{"PLUGIN_TAG", "PLUGIN_TAGS"},
-			Usage:       "repository tags to use for the image",
+			Usage:       "sets repository tags to use for the image",
 			FilePath:    ".tags",
 			Destination: &settings.Build.Tags,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "tags.auto",
 			EnvVars:     []string{"PLUGIN_DEFAULT_TAGS", "PLUGIN_AUTO_TAG"},
-			Usage:       "generate tag names automatically based on git branch and git tag",
-			Value:       false,
+			Usage:       "generates tag names automatically based on git branch and git tag",
 			Destination: &settings.Build.TagsAuto,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "tags.suffix",
 			EnvVars:     []string{"PLUGIN_DEFAULT_SUFFIX", "PLUGIN_AUTO_TAG_SUFFIX"},
-			Usage:       "generate tag names with the given suffix",
+			Usage:       "generates tag names with the given suffix",
 			Destination: &settings.Build.TagsSuffix,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "args",
 			EnvVars:     []string{"PLUGIN_BUILD_ARGS"},
-			Usage:       "custom build arguments for the build",
+			Usage:       "sets custom build arguments for the build",
 			Destination: &settings.Build.Args,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "args-from-env",
 			EnvVars:     []string{"PLUGIN_BUILD_ARGS_FROM_ENV"},
-			Usage:       "forward environment variables as custom arguments to the build",
+			Usage:       "forwards environment variables as custom arguments to the build",
 			Destination: &settings.Build.ArgsEnv,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "quiet",
 			EnvVars:     []string{"PLUGIN_QUIET"},
-			Usage:       "enable suppression of the build output",
-			Value:       false,
+			Usage:       "enables suppression of the build output",
 			Destination: &settings.Build.Quiet,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "target",
 			EnvVars:     []string{"PLUGIN_TARGET"},
-			Usage:       "build target to use",
+			Usage:       "sets the build target to use",
 			Destination: &settings.Build.Target,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "cache-from",
 			EnvVars:     []string{"PLUGIN_CACHE_FROM"},
-			Usage:       "images to consider as cache sources",
+			Usage:       "sets images to consider as cache sources",
 			Destination: &settings.Build.CacheFrom,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "pull-image",
 			EnvVars:     []string{"PLUGIN_PULL_IMAGE"},
-			Usage:       "enforce to pull base image at build time",
+			Usage:       "enforces to pull base image at build time",
 			Value:       true,
 			Destination: &settings.Build.Pull,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "compress",
 			EnvVars:     []string{"PLUGIN_COMPRESS"},
-			Usage:       "enable compression of the build context using gzip",
-			Value:       false,
+			Usage:       "enables compression og the build context using gzip",
 			Destination: &settings.Build.Compress,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "repo",
 			EnvVars:     []string{"PLUGIN_REPO"},
-			Usage:       "repository name for the image",
+			Usage:       "sets repository name for the image",
 			Destination: &settings.Build.Repo,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "docker.registry",
 			EnvVars:     []string{"PLUGIN_REGISTRY", "DOCKER_REGISTRY"},
-			Usage:       "docker registry to authenticate with",
+			Usage:       "sets docker registry to authenticate with",
 			Value:       "https://index.docker.io/v1/",
 			Destination: &settings.Login.Registry,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "docker.username",
 			EnvVars:     []string{"PLUGIN_USERNAME", "DOCKER_USERNAME"},
-			Usage:       "username for registry authentication",
+			Usage:       "sets username to authenticates with",
 			Destination: &settings.Login.Username,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "docker.password",
 			EnvVars:     []string{"PLUGIN_PASSWORD", "DOCKER_PASSWORD"},
-			Usage:       "password for registry authentication",
+			Usage:       "sets password to authenticates with",
 			Destination: &settings.Login.Password,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "docker.email",
 			EnvVars:     []string{"PLUGIN_EMAIL", "DOCKER_EMAIL"},
-			Usage:       "email address for registry authentication",
+			Usage:       "sets email address to authenticates with",
 			Destination: &settings.Login.Email,
-			Category:    category,
 		},
 		&cli.StringFlag{
 			Name:        "docker.config",
 			EnvVars:     []string{"PLUGIN_CONFIG", "DOCKER_PLUGIN_CONFIG"},
-			Usage:       "content of the docker daemon json config",
+			Usage:       "sets content of the docker daemon json config",
 			Destination: &settings.Login.Config,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "docker.purge",
 			EnvVars:     []string{"PLUGIN_PURGE"},
-			Usage:       "enable cleanup of the docker environment at the end of a build",
+			Usage:       "enables cleanup of the docker environment at the end of a build",
 			Value:       true,
 			Destination: &settings.Cleanup,
-			Category:    category,
 		},
 		&cli.BoolFlag{
 			Name:        "no-cache",
 			EnvVars:     []string{"PLUGIN_NO_CACHE"},
-			Usage:       "disable the usage of cached intermediate containers",
-			Value:       false,
+			Usage:       "disables the usage of cached intermediate containers",
 			Destination: &settings.Build.NoCache,
-			Category:    category,
 		},
 		&cli.StringSliceFlag{
 			Name:        "add-host",
 			EnvVars:     []string{"PLUGIN_ADD_HOST"},
-			Usage:       "additional host:ip mapping",
+			Usage:       "sets additional host:ip mapping",
 			Destination: &settings.Build.AddHost,
-			Category:    category,
 		},
 	}
 }
--- a/cmd/drone-docker/main.go
+++ b/cmd/drone-docker/main.go
@ -5,11 +5,11 @@ import (
 	"os"

 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
 	"github.com/thegeeklab/drone-docker/plugin"
 	"github.com/urfave/cli/v2"

-	"github.com/thegeeklab/drone-plugin-lib/v2/urfave"
+	"github.com/drone-plugins/drone-plugin-lib/errors"
+	"github.com/drone-plugins/drone-plugin-lib/urfave"
 )

 var (
@ -32,12 +32,12 @@ func main() {
 		Name:    "drone-docker",
 		Usage:   "build docker container with DinD",
 		Version: BuildVersion,
-		Flags:   append(settingsFlags(settings, urfave.FlagsPluginCategory), urfave.Flags()...),
+		Flags:   append(settingsFlags(settings), urfave.Flags()...),
 		Action:  run(settings),
 	}

 	if err := app.Run(os.Args); err != nil {
-		logrus.Fatal(err)
+		errors.HandleExit(err)
 	}
 }

@ -52,11 +52,19 @@ func run(settings *plugin.Settings) cli.ActionFunc {
 		)

 		if err := plugin.Validate(); err != nil {
-			return fmt.Errorf("validation failed: %w", err)
+			if e, ok := err.(errors.ExitCoder); ok {
+				return e
+			}
+
+			return errors.ExitMessagef("validation failed: %w", err)
 		}

 		if err := plugin.Execute(); err != nil {
-			return fmt.Errorf("execution failed: %w", err)
+			if e, ok := err.(errors.ExitCoder); ok {
+				return e
+			}
+
+			return errors.ExitMessagef("execution failed: %w", err)
 		}

 		return nil
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@ -1,4 +1,4 @@
-FROM amd64/docker:20.10-dind@sha256:56a2d342dd7f25fd604f71513f765526bd522f3c256bead83b6d30c5a8006fa6
+FROM amd64/docker:19.03-dind@sha256:1875a3437d87a2fa8ec5e6fcd3233a98d571fa9692516b1e7d8eb18b7dca87a4

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
--- a/docker/Dockerfile.arm
+++ b/docker/Dockerfile.arm
@ -0,0 +1,23 @@
+FROM arm32v7/docker:19.03-dind@sha256:f998921d365053bf7e3f98794f6c23ca44e6809832d78105bc4d2da6bb8521ed
+
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="drone-docker"
+LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-docker"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-docker"
+LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-docker"
+
+ENV DOCKER_HOST=unix:///var/run/docker.sock
+
+RUN apk --update add --virtual .build-deps curl && \
+    mkdir -p /etc/docker/ && \
+    curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \
+    sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \
+    chmod 600 /etc/docker/default.json && \
+    apk del .build-deps && \
+    rm -rf /var/cache/apk/* && \
+    rm -rf /tmp/*
+
+ADD dist/drone-docker /bin/
+
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "drone-docker"]
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@ -1,4 +1,4 @@
-FROM arm64v8/docker:20.10-dind@sha256:26c7da097331ba685a7314fcfc0eb608b86b4074bab5e1beaeb57d744c5c060a
+FROM arm64v8/docker:19.03-dind@sha256:81f35202223dcd33991fcb0e12d287f854dfb63b0b47e0c805ed87c0dfc4c9b3

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
--- a/docker/manifest-quay.tmpl
+++ b/docker/manifest-quay.tmpl
@ -16,3 +16,9 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
+
+  - image: quay.io/thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@ -16,3 +16,9 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
+
+  - image: thegeeklab/drone-docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7
--- a/go.mod
+++ b/go.mod
@ -1,19 +1,17 @@
 module github.com/thegeeklab/drone-docker

-go 1.19
+go 1.18

 require (
 	github.com/coreos/go-semver v0.3.0
+	github.com/drone-plugins/drone-plugin-lib v0.4.0
 	github.com/joho/godotenv v1.4.0
-	github.com/sirupsen/logrus v1.9.0
-	github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1
-	github.com/urfave/cli/v2 v2.23.7
+	github.com/sirupsen/logrus v1.8.1
+	github.com/urfave/cli/v2 v2.4.7
 )

 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,31 +1,44 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 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-plugins/drone-plugin-lib v0.4.0 h1:qywEYGhquUuid6zNLmKia8CWY1TUa8jPQQ/G9ozfAmc=
+github.com/drone-plugins/drone-plugin-lib v0.4.0/go.mod h1:EgqogX38GoJFtckeSQyhBJYX8P+KWBPhdprAVvyRxF8=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1 h1:fta32M+y6aHG/BX+Kwxo9DQAcYpTyCBHn7sAm2qjfL0=
-github.com/thegeeklab/drone-plugin-lib/v2 v2.2.1/go.mod h1:Bu++VS6GXEWCHQdzR65dPsGtBGOMuqAQPiRVBaa+HrY=
-github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
-github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/urfave/cli/v2 v2.4.7 h1:nUgKLTC/InVYwUx26HZUBGIBZaptiW97W8vVlhuYawo=
+github.com/urfave/cli/v2 v2.4.7/go.mod h1:oDzoM7pVwz6wHn5ogWgFUU1s4VJayeQS+aEZDqXIEJs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
--- a/plugin/daemon.go
+++ b/plugin/daemon.go
@ -1,7 +1,7 @@
 package plugin

 import (
-	"io"
+	"io/ioutil"
 	"os"
 )

@ -17,8 +17,8 @@ func (p Plugin) startDaemon() {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	} else {
-		cmd.Stdout = io.Discard
-		cmd.Stderr = io.Discard
+		cmd.Stdout = ioutil.Discard
+		cmd.Stderr = ioutil.Discard
 	}
 	go func() {
 		trace(cmd)
--- a/plugin/impl.go
+++ b/plugin/impl.go
@ -2,6 +2,7 @@ package plugin

 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@ -39,6 +40,7 @@ type Login struct {

 // Build defines Docker build parameters.
 type Build struct {
+	Remote     string          // Git remote URL
 	Name       string          // Git commit sha used as docker default named tag
 	Ref        string          // Git commit ref
 	Branch     string          // Git repository branch
@ -90,12 +92,12 @@ func (p *Plugin) Validate() error {
 				p.settings.Build.TagsSuffix,
 			)
 			if err != nil {
-				logrus.Infof("cannot generate tags from %s, invalid semantic version", p.settings.Build.Ref)
+				logrus.Printf("cannot generate tags from %s, invalid semantic version", p.settings.Build.Ref)
 				return err
 			}
 			p.settings.Build.Tags = *cli.NewStringSlice(tag...)
 		} else {
-			logrus.Infof("skip auto-tagging, not on default branch or tag")
+			logrus.Printf("skip auto-tagging for %s, not on default branch or tag", p.settings.Build.Ref)
 			return nil
 		}
 	}
@ -128,7 +130,7 @@ func (p *Plugin) Execute() error {
 		}

 		path := filepath.Join(dockerHome, "config.json")
-		err := os.WriteFile(path, []byte(p.settings.Login.Config), 0o600)
+		err := ioutil.WriteFile(path, []byte(p.settings.Login.Config), 0o600)
 		if err != nil {
 			return fmt.Errorf("error writing config.json: %s", err)
 		}
@ -194,7 +196,7 @@ func (p *Plugin) Execute() error {
 			fmt.Printf("Could not prune system containers. Ignoring...\n")
 		case err != nil && isCommandRmi(cmd.Args):
 			fmt.Printf("Could not remove image %s. Ignoring...\n", cmd.Args[2])
-		case err != nil:
+		default:
 			return err
 		}
 	}
--- a/plugin/plugin.go
+++ b/plugin/plugin.go
@ -1,7 +1,7 @@
 package plugin

 import (
-	"github.com/thegeeklab/drone-plugin-lib/v2/drone"
+	"github.com/drone-plugins/drone-plugin-lib/drone"
 )

 // Plugin implements drone.Plugin to provide the plugin implementation.