Merge pull request #377 from tphoney/prep_20.14.0

(maint) prep for v20.14.0

.drone.yml

@@ -566,69 +566,6 @@ trigger:
 depends_on:
 - testing
 
----
-kind: pipeline
-name: linux-arm-docker
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
-- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
-- name: executable
-  image: golang:1.17.3
-  commands:
-  - ./release/linux/arm/drone-docker --help
-
-- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/docker/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/docker
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
-- testing
-
 ---
 kind: pipeline
 name: notifications-docker
@@ -659,7 +596,6 @@ depends_on:
 - windows-1909-docker
 - linux-amd64-docker
 - linux-arm64-docker
-- linux-arm-docker
 
 ---
 kind: pipeline
@@ -777,64 +713,6 @@ trigger:
 depends_on:
 - linux-arm64-docker
 
----
-kind: pipeline
-name: linux-arm-gcr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
-- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
-- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/gcr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
-- linux-arm-docker
-
 ---
 kind: pipeline
 name: notifications-gcr
@@ -865,7 +743,6 @@ depends_on:
 - windows-1909-gcr
 - linux-amd64-gcr
 - linux-arm64-gcr
-- linux-arm-gcr
 
 ---
 kind: pipeline
@@ -983,64 +860,6 @@ trigger:
 depends_on:
 - linux-arm64-docker
 
----
-kind: pipeline
-name: linux-arm-ecr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
-- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
-- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/ecr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/ecr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
-- linux-arm-docker
-
 ---
 kind: pipeline
 name: notifications-ecr
@@ -1071,7 +890,6 @@ depends_on:
 - windows-1909-ecr
 - linux-amd64-ecr
 - linux-arm64-ecr
-- linux-arm-ecr
 
 ---
 kind: pipeline
@@ -1189,64 +1007,6 @@ trigger:
 depends_on:
 - linux-arm64-docker
 
----
-kind: pipeline
-name: linux-arm-heroku
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
-- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
-- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/heroku/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/heroku
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
-- linux-arm-docker
-
 ---
 kind: pipeline
 name: notifications-heroku
@@ -1275,7 +1035,6 @@ trigger:
 depends_on:
 - linux-amd64-heroku
 - linux-arm64-heroku
-- linux-arm-heroku
 
 ---
 kind: pipeline
@@ -1393,64 +1152,6 @@ trigger:
 depends_on:
 - linux-arm64-docker
 
----
-kind: pipeline
-name: linux-arm-acr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
-- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
-- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/acr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/acr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
-- linux-arm-docker
-
 ---
 kind: pipeline
 name: notifications-acr
@@ -1480,6 +1181,5 @@ depends_on:
 - windows-1909-acr
 - linux-amd64-acr
 - linux-arm64-acr
-- linux-arm-acr
 
 ...

CHANGELOG.md

@@ -1,6 +1,30 @@
 # Changelog
 
-## [v20.12.0](https://github.com/drone-plugins/drone-docker/tree/v20.12.0) (2022-05-12)
+## [v20.14.0](https://github.com/drone-plugins/drone-docker/tree/v20.14.0) (2022-11-17)
+
+[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.13.0...v20.14.0)
+
+**Implemented enhancements:**
+
+- Add support for docker --platform flag [\#376](https://github.com/drone-plugins/drone-docker/pull/376) ([tphoney](https://github.com/tphoney))
+
+**Fixed bugs:**
+
+- Use full path to docker when creating card [\#373](https://github.com/drone-plugins/drone-docker/pull/373) ([donny-dont](https://github.com/donny-dont))
+
+## [v20.13.0](https://github.com/drone-plugins/drone-docker/tree/v20.13.0) (2022-06-08)
+
+[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.12.0...v20.13.0)
+
+**Implemented enhancements:**
+
+- update docker linux amd64/arm64 to 20.10.14 [\#365](https://github.com/drone-plugins/drone-docker/pull/365) ([tphoney](https://github.com/tphoney))
+
+**Merged pull requests:**
+
+- v20.13.0 prep [\#367](https://github.com/drone-plugins/drone-docker/pull/367) ([tphoney](https://github.com/tphoney))
+
+## [v20.12.0](https://github.com/drone-plugins/drone-docker/tree/v20.12.0) (2022-05-16)
 
 [Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.11.0...v20.12.0)
 
@@ -14,6 +38,10 @@
 
 - \(fix\) Update card.json with UX [\#355](https://github.com/drone-plugins/drone-docker/pull/355) ([tphoney](https://github.com/tphoney))
 
+**Merged pull requests:**
+
+- prep for v20.12.0 [\#363](https://github.com/drone-plugins/drone-docker/pull/363) ([tphoney](https://github.com/tphoney))
+
 ## [v20.11.0](https://github.com/drone-plugins/drone-docker/tree/v20.11.0) (2022-01-19)
 
 [Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.10.9.1...v20.11.0)

README.md

@@ -62,6 +62,46 @@ docker build \
 
 > Notice: Be aware that the Docker plugin currently requires privileged capabilities, otherwise the integrated Docker daemon is not able to start.
 
+### Using Docker buildkit Secrets
+
+```yaml
+kind: pipeline
+name: default
+
+steps:
+- name: build dummy docker file and publish
+  image: plugins/docker
+  pull: never
+  settings:
+    repo: tphoney/test
+    tags: latest
+    secret: id=mysecret,src=secret-file
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+```
+
+Using a dockerfile that references the secret-file 
+
+```bash
+# syntax=docker/dockerfile:1.2
+
+FROM alpine
+
+# shows secret from default secret location:
+RUN --mount=type=secret,id=mysecret cat /run/secrets/mysecret
+```
+
+and a secret file called secret-file
+
+```
+COOL BANANAS
+```
+
+
+### Running from the CLI
+
 ```console
 docker run --rm \
   -e PLUGIN_TAG=latest \
@@ -73,6 +113,11 @@ docker run --rm \
   plugins/docker --dry-run
 ```
 
+## Developer Notes
+
+- When updating the base image, you will need to update for each architecture and OS.
+- Arm32 base images are no longer being updated.
+
 ## Release procedure
 
 Run the changelog generator.
@@ -91,4 +136,4 @@ Run the changelog generator again with the future version according to semver.
 docker run -it --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator -u drone-plugins -p drone-docker -t <secret token> --future-release v1.0.0
 ```
 
-Create your pull request for the release. Get it merged then tag the release.
+Create your pull request for the release. Get it merged then tag the release.

card.go

@@ -18,7 +18,7 @@ import (
 )
 
 func (p Plugin) writeCard() error {
-	cmd := exec.Command("docker", "inspect", p.Build.Name)
+	cmd := exec.Command(dockerExe, "inspect", p.Build.Name)
 	data, err := cmd.CombinedOutput()
 	if err != nil {
 		return err

cmd/drone-docker/main.go

@@ -269,6 +269,11 @@ func main() {
 			Usage:  "card path location to write to",
 			EnvVar: "DRONE_CARD_PATH",
 		},
+		cli.StringFlag{
+			Name:   "platform",
+			Usage:  "platform value to pass to docker",
+			EnvVar: "PLUGIN_PLATFORM",
+		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -312,6 +317,7 @@ func run(c *cli.Context) error {
 			SecretFiles: c.StringSlice("secrets-from-file"),
 			AddHost:     c.StringSlice("add-host"),
 			Quiet:       c.Bool("quiet"),
+			Platform:    c.String("platform"),
 		},
 		Daemon: docker.Daemon{
 			Registry:      c.String("docker.registry"),

docker.go

@@ -63,6 +63,7 @@ type (
 		SecretFiles []string // Docker build secrets with file as source
 		AddHost     []string // Docker build add-host
 		Quiet       bool     // Docker build quiet
+		Platform    string   // Docker build platform
 	}
 
 	// Plugin defines the Docker plugin parameters.
@@ -324,6 +325,9 @@ func commandBuild(build Build) *exec.Cmd {
 	if build.Quiet {
 		args = append(args, "--quiet")
 	}
+	if build.Platform != "" {
+		args = append(args, "--platform", build.Platform)
+	}
 
 	if build.AutoLabel {
 		labelSchema := []string{

docker/docker/Dockerfile.linux.amd64

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

docker/docker/Dockerfile.linux.arm64

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

docker/docker/manifest.tmpl

@@ -47,3 +47,9 @@ manifests:
       architecture: amd64
       os: windows
       version: 1909
+  -
+    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
+    platform:
+      architecture: amd64
+      os: windows
+      version: ltsc2022

docker_test.go

@@ -114,6 +114,27 @@ func TestCommandBuild(t *testing.T) {
 				".",
 			),
 		},
+		{
+			name: "platform argument",
+			build: Build{
+				Name:       "plugins/drone-docker:latest",
+				Dockerfile: "Dockerfile",
+				Context:    ".",
+				Platform:   "test/platform",
+			},
+			want: exec.Command(
+				dockerExe,
+				"build",
+				"--rm=true",
+				"-f",
+				"Dockerfile",
+				"-t",
+				"plugins/drone-docker:latest",
+				".",
+				"--platform",
+				"test/platform",
+			),
+		},
 	}
 
 	for _, tc := range tcs {