e2e: build and install trust plugin

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Dockerfile

@@ -74,6 +74,19 @@ RUN --mount=type=bind,target=.,ro \
     TARGET=/out ./scripts/build/binary && \
     xx-verify $([ "$GO_LINKMODE" = "static" ] && echo "--static") /out/docker
 
+FROM build-${BASE_VARIANT} AS build-trust
+ARG GO_LINKMODE=static
+ARG GO_BUILDTAGS
+ARG GO_STRIP
+ARG CGO_ENABLED
+ARG VERSION
+RUN --mount=ro --mount=type=cache,target=/root/.cache \
+    xx-go --wrap && \
+    TARGET=/out ./scripts/build/trust-plugin
+
+FROM scratch AS trust
+COPY --link --from=build-trust /out/docker-trust /
+
 FROM build-${BASE_VARIANT} AS test
 COPY --link --from=gotestsum /out/gotestsum /usr/bin/gotestsum
 ENV GO111MODULE=auto
@@ -114,6 +127,7 @@ COPY --link --from=build /out ./build/
 COPY --link --from=build-plugins /out ./build/
 COPY --link --from=buildx  /buildx         /usr/libexec/docker/cli-plugins/docker-buildx
 COPY --link --from=compose /docker-compose /usr/libexec/docker/cli-plugins/docker-compose
+COPY --link --from=trust   /docker-trust   /usr/libexec/docker/cli-plugins/docker-trust
 COPY --link . .
 ENV DOCKER_BUILDKIT=1
 ENV PATH=/go/src/github.com/docker/cli/build:$PATH

cmd/docker-trust/main.go

@@ -2,10 +2,13 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
+	"syscall"
 
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli-plugins/metadata"
 	"github.com/docker/cli/cli-plugins/plugin"
@@ -53,6 +56,14 @@ func run(cmd *command.DockerCli) error {
 	return runPlugin(cmd)
 }
 
+type errCtxSignalTerminated struct {
+	signal os.Signal
+}
+
+func (errCtxSignalTerminated) Error() string {
+	return ""
+}
+
 func main() {
 	cmd, err := command.NewDockerCli()
 	if err != nil {
@@ -64,18 +75,42 @@ func main() {
 		return
 	}
 
-	// Check the error from the run function above.
-	if sterr, ok := err.(cli.StatusError); ok {
-		if sterr.Status != "" {
-			_, _ = fmt.Fprintln(cmd.Err(), sterr.Status)
+	if errors.As(err, &errCtxSignalTerminated{}) {
+		os.Exit(getExitCode(err))
+	}
+
+	if !cerrdefs.IsCanceled(err) {
+		if err.Error() != "" {
+			_, _ = fmt.Fprintln(cmd.Err(), err)
 		}
-		// StatusError should only be used for errors, and all errors should
-		// have a non-zero exit status, so never exit with 0
-		if sterr.StatusCode == 0 {
-			os.Exit(1)
+		os.Exit(getExitCode(err))
+	}
+	// Keep CI happy, which expects a newline to be printed when terminated.
+	_, _ = fmt.Fprintln(cmd.Out())
+}
+
+// getExitCode returns the exit-code to use for the given error.
+// If err is a [cli.StatusError] and has a StatusCode set, it uses the
+// status-code from it, otherwise it returns "1" for any error.
+func getExitCode(err error) int {
+	if err == nil {
+		return 0
+	}
+
+	var userTerminatedErr errCtxSignalTerminated
+	if errors.As(err, &userTerminatedErr) {
+		s, ok := userTerminatedErr.signal.(syscall.Signal)
+		if !ok {
+			return 1
 		}
-		os.Exit(sterr.StatusCode)
+		return 128 + int(s)
+	}
+
+	var stErr cli.StatusError
+	if errors.As(err, &stErr) && stErr.StatusCode != 0 { // FIXME(thaJeztah): StatusCode should never be used with a zero status-code. Check if we do this anywhere.
+		return stErr.StatusCode
 	}
 
-	os.Exit(1)
+	// No status-code provided; all errors should have a non-zero exit code.
+	return 1
 }

scripts/build/trust-plugin

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# Build plugins examples for the host OS/ARCH
+#
+
+set -eu -o pipefail
+
+# Disable CGO - we don't need it for these plugins.
+#
+# Important: this must be done before sourcing "./scripts/build/.variables",
+# because some other variables are conditionally set whether CGO is enabled.
+export CGO_ENABLED=0
+
+source ./scripts/build/.variables
+
+TARGET_PLUGIN="$(dirname "${TARGET}")/plugins-${GOOS}-${GOARCH}/docker-trust"
+mkdir -p "$(dirname "${TARGET_PLUGIN}")"
+
+echo "Building $GO_LINKMODE $(basename "${TARGET_PLUGIN}")"
+(set -x ; GO111MODULE=auto go build -o "${TARGET_PLUGIN}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "github.com/docker/cli/cmd/docker-trust")
+
+ln -sf "${TARGET_PLUGIN}" "$(dirname "${TARGET}")/docker-trust"