FIX Plugins must be removed after each "tagging"

FIX allow pushing tags (only latest worked)
FIX is-plugin argument respected
2023-02-17 01:18:56 +01:00 · 2023-02-17 01:13:22 +01:00 · 2023-02-14 22:10:39 +01:00 · 2023-02-14 21:40:29 +01:00 · 2023-02-14 21:23:19 +01:00 · 2023-02-14 21:17:26 +01:00
31 changed files with 304 additions and 1998 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,50 +0,0 @@
-local pipeline = import 'pipeline.libsonnet';
-
-[
-  pipeline.test('linux', 'amd64'),
-
-  pipeline.build('docker', 'linux', 'amd64'),
-  pipeline.build('docker', 'linux', 'arm64'),
-  pipeline.build('docker', 'linux', 'arm'),
-  pipeline.notifications('docker', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('gcr', 'linux', 'amd64'),
-  pipeline.build('gcr', 'linux', 'arm64'),
-  pipeline.build('gcr', 'linux', 'arm'),
-  pipeline.notifications('gcr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('acr', 'linux', 'amd64'),
-  pipeline.build('acr', 'linux', 'arm64'),
-  pipeline.build('acr', 'linux', 'arm'),
-  pipeline.notifications('acr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('ecr', 'linux', 'amd64'),
-  pipeline.build('ecr', 'linux', 'arm64'),
-  pipeline.build('ecr', 'linux', 'arm'),
-  pipeline.notifications('ecr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('heroku', 'linux', 'amd64'),
-  pipeline.build('heroku', 'linux', 'arm64'),
-  pipeline.build('heroku', 'linux', 'arm'),
-  pipeline.notifications('heroku', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-]
--- a/.drone.yml
+++ b/.drone.yml
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 release
 coverage.out
 vendor
+.vscode/
+Dockerfile
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog

+## [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)
@@ -8,6 +20,10 @@

 - 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)
--- a/README.md
+++ b/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 \
@@ -96,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.
--- a/card.go
+++ b/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
--- a/cmd/drone-docker/main.go
+++ b/cmd/drone-docker/main.go
@@ -269,6 +269,27 @@ 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",
+		},
+		cli.StringFlag{
+			Name:   "ssh-agent-key",
+			Usage:  "ssh agent key to use",
+			EnvVar: "PLUGIN_SSH_AGENT_KEY",
+		},
+		cli.BoolFlag{
+			Name:   "is-plugin",
+			Usage:  "build a plugin instead of a regular image",
+			EnvVar: "PLUGIN_IS_PLUGIN",
+		},
+		cli.StringFlag{
+			Name:   "plugin-config",
+			Usage:  "path to the plugin config.json. Defaults to config.json",
+			Value:  "config.json",
+			EnvVar: "PLUGIN_PLUGIN_CONFIG",
+		},
 	}

 	if err := app.Run(os.Args); err != nil {
@@ -289,29 +310,33 @@ func run(c *cli.Context) error {
 		},
 		CardPath: c.String("drone-card-path"),
 		Build: docker.Build{
-			Remote:      c.String("remote.url"),
-			Name:        c.String("commit.sha"),
-			Dockerfile:  c.String("dockerfile"),
-			Context:     c.String("context"),
-			Tags:        c.StringSlice("tags"),
-			Args:        c.StringSlice("args"),
-			ArgsEnv:     c.StringSlice("args-from-env"),
-			Target:      c.String("target"),
-			Squash:      c.Bool("squash"),
-			Pull:        c.BoolT("pull-image"),
-			CacheFrom:   c.StringSlice("cache-from"),
-			Compress:    c.Bool("compress"),
-			Repo:        c.String("repo"),
-			Labels:      c.StringSlice("custom-labels"),
-			LabelSchema: c.StringSlice("label-schema"),
-			AutoLabel:   c.BoolT("auto-label"),
-			Link:        c.String("link"),
-			NoCache:     c.Bool("no-cache"),
-			Secret:      c.String("secret"),
-			SecretEnvs:  c.StringSlice("secrets-from-env"),
-			SecretFiles: c.StringSlice("secrets-from-file"),
-			AddHost:     c.StringSlice("add-host"),
-			Quiet:       c.Bool("quiet"),
+			Remote:       c.String("remote.url"),
+			Name:         c.String("commit.sha"),
+			Dockerfile:   c.String("dockerfile"),
+			Context:      c.String("context"),
+			Tags:         c.StringSlice("tags"),
+			Args:         c.StringSlice("args"),
+			ArgsEnv:      c.StringSlice("args-from-env"),
+			Target:       c.String("target"),
+			Squash:       c.Bool("squash"),
+			Pull:         c.BoolT("pull-image"),
+			CacheFrom:    c.StringSlice("cache-from"),
+			Compress:     c.Bool("compress"),
+			Repo:         c.String("repo"),
+			Labels:       c.StringSlice("custom-labels"),
+			LabelSchema:  c.StringSlice("label-schema"),
+			AutoLabel:    c.BoolT("auto-label"),
+			Link:         c.String("link"),
+			NoCache:      c.Bool("no-cache"),
+			Secret:       c.String("secret"),
+			SecretEnvs:   c.StringSlice("secrets-from-env"),
+			SecretFiles:  c.StringSlice("secrets-from-file"),
+			AddHost:      c.StringSlice("add-host"),
+			Quiet:        c.Bool("quiet"),
+			Platform:     c.String("platform"),
+			SSHAgentKey:  c.String("ssh-agent-key"),
+			IsPlugin:     c.Bool("is-plugin"),
+			PluginConfig: c.String("plugin-config"),
 		},
 		Daemon: docker.Daemon{
 			Registry:      c.String("docker.registry"),
--- a/daemon.go
+++ b/daemon.go
@@ -1,9 +1,10 @@
+//go:build !windows
 // +build !windows

 package docker

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

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

 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -40,29 +39,34 @@ type (

 	// Build defines Docker build parameters.
 	Build struct {
-		Remote      string   // Git remote URL
-		Name        string   // Docker build using default named tag
-		Dockerfile  string   // Docker build Dockerfile
-		Context     string   // Docker build context
-		Tags        []string // Docker build tags
-		Args        []string // Docker build args
-		ArgsEnv     []string // Docker build args from env
-		Target      string   // Docker build target
-		Squash      bool     // Docker build squash
-		Pull        bool     // Docker build pull
-		CacheFrom   []string // Docker build cache-from
-		Compress    bool     // Docker build compress
-		Repo        string   // Docker build repository
-		LabelSchema []string // label-schema Label map
-		AutoLabel   bool     // auto-label bool
-		Labels      []string // Label map
-		Link        string   // Git repo link
-		NoCache     bool     // Docker build no-cache
-		Secret      string   // secret keypair
-		SecretEnvs  []string // Docker build secrets with env var as source
-		SecretFiles []string // Docker build secrets with file as source
-		AddHost     []string // Docker build add-host
-		Quiet       bool     // Docker build quiet
+		Remote       string   // Git remote URL
+		Name         string   // Docker build using default named tag
+		Dockerfile   string   // Docker build Dockerfile
+		Context      string   // Docker build context
+		Tags         []string // Docker build tags
+		Args         []string // Docker build args
+		ArgsEnv      []string // Docker build args from env
+		Target       string   // Docker build target
+		Squash       bool     // Docker build squash
+		Pull         bool     // Docker build pull
+		CacheFrom    []string // Docker build cache-from
+		Compress     bool     // Docker build compress
+		Repo         string   // Docker build repository
+		LabelSchema  []string // label-schema Label map
+		AutoLabel    bool     // auto-label bool
+		Labels       []string // Label map
+		Link         string   // Git repo link
+		NoCache      bool     // Docker build no-cache
+		Secret       string   // secret keypair
+		SecretEnvs   []string // Docker build secrets with env var as source
+		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
+		SSHAgentKey  string   // Docker build ssh agent key
+		SSHKeyPath   string   // Docker build ssh key path
+		IsPlugin     bool     // Build docker plugin instead of plain image
+		PluginConfig string   // Plugin config file path, defaults to config.json
 	}

 	// Plugin defines the Docker plugin parameters.
@@ -105,6 +109,7 @@ type (

 // Exec executes the plugin step
 func (p Plugin) Exec() error {
+
 	// start the Docker daemon server
 	if !p.Daemon.Disabled {
 		p.startDaemon()
@@ -143,7 +148,7 @@ func (p Plugin) Exec() error {
 		os.MkdirAll(dockerHome, 0600)

 		path := filepath.Join(dockerHome, "config.json")
-		err := ioutil.WriteFile(path, []byte(p.Login.Config), 0600)
+		err := os.WriteFile(path, []byte(p.Login.Config), 0600)
 		if err != nil {
 			return fmt.Errorf("Error writing config.json: %s", err)
 		}
@@ -178,14 +183,41 @@ func (p Plugin) Exec() error {
 		cmds = append(cmds, commandPull(img))
 	}

+	// setup for using ssh agent (https://docs.docker.com/develop/develop-images/build_enhancements/#using-ssh-to-access-private-data-in-builds)
+	if p.Build.SSHAgentKey != "" {
+		var sshErr error
+		p.Build.SSHKeyPath, sshErr = writeSSHPrivateKey(p.Build.SSHAgentKey)
+		if sshErr != nil {
+			return sshErr
+		}
+	}
+
 	cmds = append(cmds, commandBuild(p.Build)) // docker build

+	if p.Build.IsPlugin {
+		cmds = append(cmds, exec.Command("mkdir", "-p", "plugin/rootfs"))
+		cmds = append(cmds, exec.Command(dockerExe, "create", "--name", "tmp", p.Build.Name))
+		cmds = append(cmds, exec.Command(dockerExe, "export", "-o", "tmp.tar", "tmp"))
+		cmds = append(cmds, exec.Command(dockerExe, "rm", "tmp"))
+		cmds = append(cmds, exec.Command(dockerExe, "image", "rm", p.Build.Name))
+		cmds = append(cmds, exec.Command("tar", "x", "-C", "plugin/rootfs", "-f", "tmp.tar"))
+		cmds = append(cmds, exec.Command("cp", p.Build.PluginConfig, "plugin/config.json"))
+	}
+
 	for _, tag := range p.Build.Tags {
-		cmds = append(cmds, commandTag(p.Build, tag)) // docker tag
+		if !p.Build.IsPlugin {
+			cmds = append(cmds, commandTag(p.Build, tag)) // docker tag
+		} else {
+			cmds = append(cmds, exec.Command(dockerExe, "plugin", "create", p.Build.Repo+":"+tag, "plugin"))
+		}

 		if !p.Dryrun {
 			cmds = append(cmds, commandPush(p.Build, tag)) // docker push
 		}
+
+		if p.Build.IsPlugin {
+			cmds = append(cmds, exec.Command(dockerExe, "plugin", "rm", p.Build.Repo+":"+tag))
+		}
 	}

 	// execute all commands in batch mode.
@@ -324,6 +356,12 @@ func commandBuild(build Build) *exec.Cmd {
 	if build.Quiet {
 		args = append(args, "--quiet")
 	}
+	if build.Platform != "" {
+		args = append(args, "--platform", build.Platform)
+	}
+	if build.SSHKeyPath != "" {
+		args = append(args, "--ssh", build.SSHKeyPath)
+	}

 	if build.AutoLabel {
 		labelSchema := []string{
@@ -349,8 +387,8 @@ func commandBuild(build Build) *exec.Cmd {
 		}
 	}

-	// we need to enable buildkit, for secret support
-	if build.Secret != "" || len(build.SecretEnvs) > 0 || len(build.SecretFiles) > 0 {
+	// we need to enable buildkit, for secret support and ssh agent support
+	if build.Secret != "" || len(build.SecretEnvs) > 0 || len(build.SecretFiles) > 0 || build.SSHAgentKey != "" {
 		os.Setenv("DOCKER_BUILDKIT", "1")
 	}
 	return exec.Command(dockerExe, args...)
@@ -441,7 +479,11 @@ func commandTag(build Build, tag string) *exec.Cmd {
 // helper function to create the docker push command.
 func commandPush(build Build, tag string) *exec.Cmd {
 	target := fmt.Sprintf("%s:%s", build.Repo, tag)
-	return exec.Command(dockerExe, "push", target)
+	if build.IsPlugin {
+		return exec.Command(dockerExe, "plugin", "push", target)
+	} else {
+		return exec.Command(dockerExe, "push", target)
+	}
 }

 // helper function to create the docker daemon command.
@@ -503,6 +545,23 @@ func commandRmi(tag string) *exec.Cmd {
 	return exec.Command(dockerExe, "rmi", tag)
 }

+func writeSSHPrivateKey(key string) (path string, err error) {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return "", fmt.Errorf("unable to determine home directory: %s", err)
+	}
+	if err := os.MkdirAll(filepath.Join(home, ".ssh"), 0700); err != nil {
+		return "", fmt.Errorf("unable to create .ssh directory: %s", err)
+	}
+	pathToKey := filepath.Join(home, ".ssh", "id_rsa")
+	if err := os.WriteFile(pathToKey, []byte(key), 0400); err != nil {
+		return "", fmt.Errorf("unable to write ssh key %s: %s", pathToKey, err)
+	}
+	path = fmt.Sprintf("default=%s", pathToKey)
+
+	return path, nil
+}
+
 // trace writes each command to stdout with the command wrapped in an xml
 // tag so that it can be extracted and displayed in the logs.
 func trace(cmd *exec.Cmd) {
--- a/docker/acr/Dockerfile.linux.arm
+++ b/docker/acr/Dockerfile.linux.arm
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm/drone-acr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-acr"]
--- a/docker/acr/Dockerfile.windows.amd64.1909
+++ b/docker/acr/Dockerfile.windows.amd64.1909
@@ -1,10 +0,0 @@
-# escape=`
-FROM plugins/docker:windows-1909-amd64
-
-LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
-  org.label-schema.name="Drone ACR" `
-  org.label-schema.vendor="Drone.IO Community" `
-  org.label-schema.schema-version="1.0"
-
-ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe
-ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ]
--- a/docker/acr/Dockerfile.windows.amd64.ltsc2022
+++ b/docker/acr/Dockerfile.windows.amd64.ltsc2022
@@ -1,5 +1,5 @@
 # escape=`
-FROM plugins/docker:windows-1803-amd64
+FROM plugins/docker:windows-ltsc2022-amd64

 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
  org.label-schema.name="Drone ACR" `
--- a/docker/acr/manifest.tmpl
+++ b/docker/acr/manifest.tmpl
@@ -17,18 +17,6 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
-  -
-    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1803
  -
    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
    platform:
@@ -36,14 +24,8 @@ manifests:
      os: windows
      version: 1809
  -
-    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64
+    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
    platform:
      architecture: amd64
      os: windows
-      version: 1903
-  -
-    image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1909
+      version: ltsc2022
--- a/docker/docker/Dockerfile.linux.arm
+++ b/docker/docker/Dockerfile.linux.arm
@@ -1,15 +0,0 @@
-FROM arm32v6/docker:19.03.8-dind
-
-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 release/linux/arm/drone-docker /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"]
--- a/docker/docker/Dockerfile.windows.amd64.1803
+++ b/docker/docker/Dockerfile.windows.amd64.1803
@@ -1,26 +0,0 @@
-# escape=`
-FROM mcr.microsoft.com/windows/servercore:1803 as download
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ENV DOCKER_VERSION 18.09.1
-
-RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; `
-    Expand-Archive innoextract.zip -DestinationPath C:\ ; `
-    Remove-Item -Path innoextract.zip
-
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
-    Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
-RUN /innoextract.exe dockertoolbox.exe
-
-FROM plugins/base:windows-1803
-
-LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
-  org.label-schema.name="Drone Docker" `
-  org.label-schema.vendor="Drone.IO Community" `
-  org.label-schema.schema-version="1.0"
-
-COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
-COPY --from=download /app/docker.exe C:/bin/docker.exe
-ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe
-ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ]
--- a/docker/docker/Dockerfile.windows.amd64.1809
+++ b/docker/docker/Dockerfile.windows.amd64.1809
@@ -1,9 +1,10 @@
 # escape=`
-FROM mcr.microsoft.com/windows/servercore:1809 as download
+# using 1809-KB5021237-amd64 as base image, 1809-KB5022286-amd64 does not work
+FROM mcr.microsoft.com/windows/servercore:1809-KB5021237 as download

 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

-ENV DOCKER_VERSION 18.09.1
+ENV DOCKER_VERSION 19.03.1

 RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; `
    Expand-Archive innoextract.zip -DestinationPath C:\ ; `
@@ -13,7 +14,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
    Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
 RUN /innoextract.exe dockertoolbox.exe

-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:1809-KB5021237-amd64
+
 USER ContainerAdministrator

 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
@@ -21,6 +23,7 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
  org.label-schema.vendor="Drone.IO Community" `
  org.label-schema.schema-version="1.0"

+RUN mkdir C:\bin
 COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
 COPY --from=download /app/docker.exe C:/bin/docker.exe
 ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe
--- a/docker/docker/Dockerfile.windows.amd64.1909
+++ b/docker/docker/Dockerfile.windows.amd64.1909
@@ -1,28 +0,0 @@
-# escape=`
-FROM mcr.microsoft.com/windows/servercore:1909 as download
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-ENV DOCKER_VERSION 19.03.1
-
-RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; `
-    Expand-Archive innoextract.zip -DestinationPath C:\ ; `
-    Remove-Item -Path innoextract.zip
-
-RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
-    Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
-RUN /innoextract.exe dockertoolbox.exe
-
-FROM mcr.microsoft.com/windows/nanoserver:1909
-USER ContainerAdministrator
-
-LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
-  org.label-schema.name="Drone Docker" `
-  org.label-schema.vendor="Drone.IO Community" `
-  org.label-schema.schema-version="1.0"
-
-RUN mkdir C:\bin
-COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
-COPY --from=download /app/docker.exe C:/bin/docker.exe
-ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe
-ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ]
--- a/docker/docker/Dockerfile.windows.amd64.ltsc2022
+++ b/docker/docker/Dockerfile.windows.amd64.ltsc2022
@@ -1,5 +1,5 @@
 # escape=`
-FROM mcr.microsoft.com/windows/servercore:1903 as download
+FROM mcr.microsoft.com/windows/servercore:ltsc2022 as download

 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

@@ -13,7 +13,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
    Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
 RUN /innoextract.exe dockertoolbox.exe

-FROM mcr.microsoft.com/windows/nanoserver:1903
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 USER ContainerAdministrator

 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
--- a/docker/docker/manifest.tmpl
+++ b/docker/docker/manifest.tmpl
@@ -17,18 +17,6 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
-  -
-    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1803
  -
    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
    platform:
@@ -36,14 +24,8 @@ manifests:
      os: windows
      version: 1809
  -
-    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64
+    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
    platform:
      architecture: amd64
      os: windows
-      version: 1903
-  -
-    image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1909
+      version: ltsc2022
--- a/docker/ecr/Dockerfile.linux.arm
+++ b/docker/ecr/Dockerfile.linux.arm
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm/drone-ecr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"]
--- a/docker/ecr/Dockerfile.windows.amd64.1803
+++ b/docker/ecr/Dockerfile.windows.amd64.1803
@@ -1,10 +0,0 @@
-# escape=`
-FROM plugins/docker:windows-1803-amd64
-
-LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
-  org.label-schema.name="Drone ECR" `
-  org.label-schema.vendor="Drone.IO Community" `
-  org.label-schema.schema-version="1.0"
-
-ADD release/windows/amd64/drone-ecr.exe C:/bin/drone-ecr.exe
-ENTRYPOINT [ "C:\\bin\\drone-ecr.exe" ]
--- a/docker/ecr/Dockerfile.windows.amd64.ltsc2022
+++ b/docker/ecr/Dockerfile.windows.amd64.ltsc2022
@@ -1,5 +1,5 @@
 # escape=`
-FROM plugins/docker:windows-1909-amd64
+FROM plugins/docker:windows-ltsc2022-amd64

 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
  org.label-schema.name="Drone ECR" `
--- a/docker/ecr/manifest.tmpl
+++ b/docker/ecr/manifest.tmpl
@@ -17,18 +17,6 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
-  -
-    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1803
  -
    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
    platform:
@@ -36,14 +24,8 @@ manifests:
      os: windows
      version: 1809
  -
-    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64
+    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
    platform:
      architecture: amd64
      os: windows
-      version: 1903
-  -
-    image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1909
+      version: ltsc2022
--- a/docker/gcr/Dockerfile.linux.arm
+++ b/docker/gcr/Dockerfile.linux.arm
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm/drone-gcr /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"]
--- a/docker/gcr/Dockerfile.windows.amd64.1909
+++ b/docker/gcr/Dockerfile.windows.amd64.1909
@@ -1,10 +0,0 @@
-# escape=`
-FROM plugins/docker:windows-1909-amd64
-
-LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
-  org.label-schema.name="Drone GCR" `
-  org.label-schema.vendor="Drone.IO Community" `
-  org.label-schema.schema-version="1.0"
-
-ADD release/windows/amd64/drone-gcr.exe C:/bin/drone-gcr.exe
-ENTRYPOINT [ "C:\\bin\\drone-gcr.exe" ]
--- a/docker/gcr/Dockerfile.windows.amd64.ltsc2022
+++ b/docker/gcr/Dockerfile.windows.amd64.ltsc2022
@@ -1,5 +1,5 @@
 # escape=`
-FROM plugins/docker:windows-1803-amd64
+FROM plugins/docker:windows-ltsc2022-amd64

 LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
  org.label-schema.name="Drone GCR" `
--- a/docker/gcr/manifest.tmpl
+++ b/docker/gcr/manifest.tmpl
@@ -17,18 +17,6 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
-  -
-    image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1803
  -
    image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
    platform:
@@ -36,8 +24,8 @@ manifests:
      os: windows
      version: 1809
  -
-    image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64
+    image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
    platform:
      architecture: amd64
      os: windows
-      version: 1909
+      version: ltsc2022
--- a/docker/heroku/Dockerfile.linux.arm
+++ b/docker/heroku/Dockerfile.linux.arm
@@ -1,4 +0,0 @@
-FROM plugins/docker:linux-arm
-
-ADD release/linux/arm/drone-heroku /bin/
-ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-heroku"]
--- a/docker/heroku/manifest.tmpl
+++ b/docker/heroku/manifest.tmpl
@@ -17,9 +17,3 @@ manifests:
      architecture: arm64
      os: linux
      variant: v8
-  -
-    image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
--- a/docker_test.go
+++ b/docker_test.go
@@ -114,6 +114,47 @@ 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",
+			),
+		},
+		{
+			name: "ssh agent",
+			build: Build{
+				Name:       "plugins/drone-docker:latest",
+				Dockerfile: "Dockerfile",
+				Context:    ".",
+				SSHKeyPath: "id_rsa=/root/.ssh/id_rsa",
+			},
+			want: exec.Command(
+				dockerExe,
+				"build",
+				"--rm=true",
+				"-f",
+				"Dockerfile",
+				"-t",
+				"plugins/drone-docker:latest",
+				".",
+				"--ssh id_rsa=/root/.ssh/id_rsa",
+			),
+		},
 	}

 	for _, tc := range tcs {
--- a/pipeline.libsonnet
+++ b/pipeline.libsonnet
@@ -1,206 +0,0 @@
-local windows_pipe = '\\\\\\\\.\\\\pipe\\\\docker_engine';
-local windows_pipe_volume = 'docker_pipe';
-local test_pipeline_name = 'testing';
-
-local windows(os) = os == 'windows';
-
-local golang_image(os, version) =
-  'golang:' + '1.13' + if windows(os) then '-windowsservercore-' + version else '';
-
-{
-  test(os='linux', arch='amd64', version='')::
-    local is_windows = windows(os);
-    local golang = golang_image(os, version);
-    local volumes = if is_windows then [{name: 'gopath', path: 'C:\\\\gopath'}] else [{name: 'gopath', path: '/go',}];
-    {
-      kind: 'pipeline',
-      name: test_pipeline_name,
-      platform: {
-        os: os,
-        arch: arch,
-        version: if std.length(version) > 0 then version,
-      },
-      steps: [
-        {
-          name: 'vet',
-          image: golang,
-          pull: 'always',
-          environment: {
-            GO111MODULE: 'on',
-          },
-          commands: [
-            'go vet ./...',
-          ],
-          volumes: volumes,
-        },
-        {
-          name: 'test',
-          image: golang,
-          pull: 'always',
-          environment: {
-            GO111MODULE: 'on',
-          },
-          commands: [
-            'go test -cover ./...',
-          ],
-          volumes: volumes,
-        },
-      ],
-      trigger: {
-        ref: [
-          'refs/heads/master',
-          'refs/tags/**',
-          'refs/pull/**',
-        ],
-      },
-      volumes: [{name: 'gopath', temp: {}}]
-    },
-
-  build(name, os='linux', arch='amd64', version='')::
-    local is_windows = windows(os);
-    local tag = if is_windows then os + '-' + version else os + '-' + arch;
-    local file_suffix = std.strReplace(tag, '-', '.');
-    local volumes = if is_windows then [{ name: windows_pipe_volume, path: windows_pipe }] else [];
-    local golang = golang_image(os, version);
-    local plugin_repo = 'plugins/' + name;
-    local extension = if is_windows then '.exe' else '';
-    local depends_on = if name == 'docker' then [test_pipeline_name] else [tag + '-docker'];
-    {
-      kind: 'pipeline',
-      name: tag + '-' + name,
-      platform: {
-        os: os,
-        arch: arch,
-        version: if std.length(version) > 0 then version,
-      },
-      steps: [
-        {
-          name: 'build-push',
-          image: golang,
-          pull: 'always',
-          environment: {
-            CGO_ENABLED: '0',
-            GO111MODULE: 'on',
-          },
-          commands: [
-            'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/' + os + '/' + arch + '/drone-' + name + extension + ' ./cmd/drone-' + name,
-          ],
-          when: {
-            event: {
-              exclude: ['tag'],
-            },
-          },
-        },
-        {
-          name: 'build-tag',
-          image: golang,
-          pull: 'always',
-          environment: {
-            CGO_ENABLED: '0',
-            GO111MODULE: 'on',
-          },
-          commands: [
-            'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/' + os + '/' + arch + '/drone-' + name + extension + ' ./cmd/drone-' + name,
-          ],
-          when: {
-            event: ['tag'],
-          },
-        },
-        if name == "docker" then {
-          name: 'executable',
-          image: golang,
-          pull: 'always',
-          commands: [
-            './release/' + os + '/' + arch + '/drone-' + name + extension + ' --help',
-          ],
-        },
-        {
-          name: 'dryrun',
-          image: 'plugins/docker:' + tag,
-          pull: 'always',
-          settings: {
-            dry_run: true,
-            tags: tag,
-            dockerfile: 'docker/'+ name +'/Dockerfile.' + file_suffix,
-            daemon_off: if is_windows then 'true' else 'false',
-            repo: plugin_repo,
-            username: { from_secret: 'docker_username' },
-            password: { from_secret: 'docker_password' },
-          },
-          volumes: if std.length(volumes) > 0 then volumes,
-          when: {
-            event: ['pull_request'],
-          },
-        },
-        {
-          name: 'publish',
-          image: 'plugins/docker:' + tag,
-          pull: 'always',
-          settings: {
-            auto_tag: true,
-            auto_tag_suffix: tag,
-            daemon_off: if is_windows then 'true' else 'false',
-            dockerfile: 'docker/' + name + '/Dockerfile.' + file_suffix,
-            repo: plugin_repo,
-            username: { from_secret: 'docker_username' },
-            password: { from_secret: 'docker_password' },
-          },
-          volumes: if std.length(volumes) > 0 then volumes,
-          when: {
-            event: {
-              exclude: ['pull_request'],
-            },
-          },
-        },
-      ],
-      trigger: {
-        ref: [
-          'refs/heads/master',
-          'refs/tags/**',
-          'refs/pull/**',
-        ],
-      },
-      depends_on: depends_on,
-      volumes: if is_windows then [{ name: windows_pipe_volume, host: { path: windows_pipe } }],
-    },
-
-  notifications(name, os='linux', arch='amd64', version='', depends_on=[])::
-    {
-      kind: 'pipeline',
-      name: 'notifications-' + name,
-      platform: {
-        os: os,
-        arch: arch,
-        version: if std.length(version) > 0 then version,
-      },
-      steps: [
-        {
-          name: 'manifest',
-          image: 'plugins/manifest',
-          pull: 'always',
-          settings: {
-            username: { from_secret: 'docker_username' },
-            password: { from_secret: 'docker_password' },
-            spec: 'docker/' + name + '/manifest.tmpl',
-            ignore_missing: true,
-            auto_tag: true,
-          },
-        },
-        {
-          name: 'microbadger',
-          image: 'plugins/webhook',
-          pull: 'always',
-          settings: {
-            urls: { from_secret: 'microbadger_' + name },
-          },
-        },
-      ],
-      depends_on: [x + '-' + name for x in depends_on],
-      trigger: {
-        ref: [
-          'refs/heads/master',
-          'refs/tags/**',
-        ],
-      },
-    },
-}
Author	SHA1	Message	Date
Roman Vaníček	c1ca3abaec	FIX Plugins must be removed after each "tagging" All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-17 01:18:56 +01:00
Roman Vaníček	2352c4171f	FIX allow pushing tags (only latest worked) All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-17 01:13:22 +01:00
Roman Vaníček	7dc78fc088	FIX is-plugin argument respected All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 22:10:39 +01:00
Roman Vaníček	564953fda2	FIX to get image files container must be created temporarily All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 21:40:29 +01:00
Roman Vaníček	15917e498e	FIX mkdir All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 21:23:19 +01:00
Roman Vaníček	f35499449d	HACK always as a plugin All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 21:17:26 +01:00
Roman Vaníček	777f882332	FIX parameter parsing - second try Some checks failed continuous-integration/drone/push Build was killed Details	2023-02-14 20:55:59 +01:00
Roman Vaníček	d767d847d3	FIX Input parameter parsing. All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 20:35:31 +01:00
Roman Vaníček	29b7a81c97	FIX image push All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-14 18:38:21 +01:00
Roman Vaníček	1c1ebd98ce	Initial plugin support Some checks failed continuous-integration/drone/push Build is failing Details	2023-02-14 18:35:06 +01:00
TP Honey	f6d94e4ab8	Update .drone.yml	2023-01-30 13:35:42 +00:00
TP Honey	7ce09b0eba	windows 1809 docker build pin (#384 )	2023-01-30 13:09:06 +00:00
TP Honey	024f906d29	windows 1809 docker build pin	2023-01-26 14:12:45 +00:00
TP Honey	475bb7a004	Update .drone.yml	2023-01-26 13:57:41 +00:00
TP Honey	2dcf4a5d49	Merge pull request #382 from tphoney/enable-ssh-agent Add option to mount host ssh agent (--ssh)	2023-01-26 10:02:52 +00:00
TP Honey	d70414892d	ssh agent support	2023-01-25 13:55:45 +00:00
Trent Albright	84d8664c70	support agent forwarding missed error check add debugging fix empty val for SSHAgent fix flag type remove [] debug base64 encode ssh key fix remove debug output code cleanup Update docker.go	2023-01-17 14:15:08 +00:00
Ole Henning	4d92e8103d	Add option to mount host ssh agent (--ssh)	2023-01-17 12:43:56 +00:00
TP Honey	94c8139150	(maint) move to harness.drone.io (#381 ) * (maint) move to harness.drone.io * simplify windows builds	2023-01-17 11:34:59 +00:00
TP Honey	7888a798b1	Merge pull request #377 from tphoney/prep_20.14.0 (maint) prep for v20.14.0	2022-11-17 14:12:23 +00:00
TP Honey	8a12346d2f	(maint) prep for v20.14.0	2022-11-17 14:03:02 +00:00
Dan Wilson	12be10a7ce	Merge pull request #376 from tphoney/add_support_for_platform_flag Add support for docker --platform flag	2022-11-17 13:37:40 +00:00
Marcelo E. Magallon	5a691ae1e4	Add support for docker --platform flag Add a --platform flag so that the user can specify a value for the corresponding flag passed to docker. This is useful in the context of multi-arch builds and buildkit (DOCKER_BUILDKIT=1 in the environment). Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>	2022-11-17 13:31:29 +00:00
Don	0d40d7fa5a	Remove arm builds	2022-09-30 16:33:31 -07:00
Don	a1fb315f3b	Add ltsc2022 to docker manifest	2022-09-30 16:31:09 -07:00
TP Honey	d0e7d7f01b	Merge pull request #373 from donny-dont/docker-card-windows Use full path to docker when creating card	2022-09-15 10:02:11 +01:00
Don	eb53fd1f17	Use full path to docker when creating card Windows docker builds failed to create the card using `docker inspect` because docker isn't on the path. Instead use `dockerExec` from `daemon.go` which has the full path to the executable.	2022-09-14 09:46:21 -07:00
TP Honey	a842dfe557	(maint) add secrets docs	2022-07-04 13:24:26 +01:00