diff --git a/.drone.jsonnet b/.drone.jsonnet index 3ec9e96..6b80f48 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -140,7 +140,7 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'dryrun', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker:19.4.2', settings: { dry_run: true, dockerfile: 'docker/Dockerfile.' + arch, @@ -153,7 +153,7 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'publish-dockerhub', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker:19.4.2', settings: { auto_tag: true, auto_tag_suffix: arch, @@ -169,7 +169,7 @@ local PipelineBuildContainer(arch='amd64') = { }, { name: 'publish-quay', - image: 'thegeeklab/drone-docker:19', + image: 'thegeeklab/drone-docker:19.4.2', settings: { auto_tag: true, auto_tag_suffix: arch, diff --git a/.drone.yml b/.drone.yml index 067b9e8..55d34dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -110,7 +110,7 @@ steps: - make build - name: dryrun - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: dockerfile: docker/Dockerfile.amd64 dry_run: true @@ -122,7 +122,7 @@ steps: - build - name: publish-dockerhub - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: amd64 @@ -140,7 +140,7 @@ steps: - dryrun - name: publish-quay - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: amd64 @@ -182,7 +182,7 @@ steps: - make build - name: dryrun - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: dockerfile: docker/Dockerfile.arm64 dry_run: true @@ -194,7 +194,7 @@ steps: - build - name: publish-dockerhub - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: arm64 @@ -212,7 +212,7 @@ steps: - dryrun - name: publish-quay - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: arm64 @@ -254,7 +254,7 @@ steps: - make build - name: dryrun - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: dockerfile: docker/Dockerfile.arm dry_run: true @@ -266,7 +266,7 @@ steps: - build - name: publish-dockerhub - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: arm @@ -284,7 +284,7 @@ steps: - dryrun - name: publish-quay - image: thegeeklab/drone-docker:19 + image: thegeeklab/drone-docker:19.4.2 settings: auto_tag: true auto_tag_suffix: arm @@ -454,6 +454,6 @@ depends_on: --- kind: signature -hmac: 9272f58ad1c23c3d09fe6d4c61d4f6343c9fc70229826a55c45179182b6e5f49 +hmac: c7936b051185eea97ca550875cd641ce6bf5a2229791dafa36b3a31961ed8722 ... diff --git a/.golangci.yml b/.golangci.yml index ee4936b..7bb18ea 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -29,10 +29,3 @@ linters-settings: gofumpt: extra-rules: true lang-version: "1.18" - -issues: - exclude-rules: - - path: plugin/daemon.go - linters: - - errcheck - text: "Error return value of `cmd.Run` is not checked" diff --git a/plugin/daemon.go b/plugin/daemon.go index c303dca..0a4eb02 100644 --- a/plugin/daemon.go +++ b/plugin/daemon.go @@ -22,6 +22,6 @@ func (p Plugin) startDaemon() { } go func() { trace(cmd) - cmd.Run() + _ = cmd.Run() }() } diff --git a/plugin/impl.go b/plugin/impl.go index 5fc5c84..969e6cf 100644 --- a/plugin/impl.go +++ b/plugin/impl.go @@ -196,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]) - default: + case err != nil: return err } }