Merge pull request containerd#4162 from ktock/buildg-v0.5

Bump up buildg to v0.5.2 and extend startup timeout

Author: AkihiroSuda

Dockerfile

@@ -38,7 +38,7 @@ ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v2.1.2@BINARY
 # Extra deps: Init
 ARG TINI_VERSION=v0.19.0@BINARY
 # Extra deps: Debug
-ARG BUILDG_VERSION=v0.4.1@BINARY
+ARG BUILDG_VERSION=v0.5.2@BINARY
 
 # Test deps
 # Currently, the Docker Official Images and the test deps are not pinned by the hash

Dockerfile.d/SHA256SUMS.d/buildg-v0.4.1

@@ -0,0 +1,2 @@
+70371949ac56d118e55306091640e63537069a538a97c151eb7475c07cb5a8a4  buildg-v0.5.2-linux-amd64.tar.gz
+9c44a5f8ecc3035998a07e1c564338205700cf5287c723e8ccba1da2815168cc  buildg-v0.5.2-linux-arm64.tar.gz

Dockerfile.d/SHA256SUMS.d/buildg-v0.5.2

@@ -21,6 +21,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"
 
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
@@ -146,6 +147,7 @@ func debugCommand() *cobra.Command {
 	cmd.Flags().String("image", "", "Image to use for debugging stage")
 	cmd.Flags().StringArray("ssh", nil, "Allow forwarding SSH agent to the build. Format: default|<id>[=<socket>|<key>[,<key>]]")
 	cmd.Flags().StringArray("secret", nil, "Expose secret value to the build. Format: id=secretname,src=filepath")
+	helpers.AddDurationFlag(cmd, "buildg-startup-timeout", nil, 1*time.Minute, "", "Timeout for starting up buildg")
 	return cmd
 }
 
@@ -167,6 +169,12 @@ func debugAction(cmd *cobra.Command, args []string) error {
 		buildgArgs = append([]string{"--debug"}, buildgArgs...)
 	}
 
+	startupTimeout, err := cmd.Flags().GetDuration("buildg-startup-timeout")
+	if err != nil {
+		return err
+	}
+	buildgArgs = append(buildgArgs, "--startup-timeout="+startupTimeout.String())
+
 	if file, err := cmd.Flags().GetString("file"); err != nil {
 		return err
 	} else if file != "" {