Merges changes with upstream

.web-docs/components/builder/docker/README.md

@@ -32,6 +32,11 @@ source "docker" "example" {
   export_path = "image.tar"
 }
 
+build {
+  sources = ["source.docker.example"]
+}
+```
+
 **JSON**
 
 ```json
@@ -42,11 +47,6 @@ source "docker" "example" {
 }
 ```
 
-build {
-  sources = ["source.docker.example"]
-}
-```
-
 ## Basic Example: Commit
 
 Below is another example, the same as above but instead of exporting the
@@ -298,23 +298,23 @@ You must specify (only) one of `commit`, `discard`, or `export_path`.
 
 - `platform` (string) - Set platform if server is multi-platform capable
 
-  If using `build`, this field will be ignored, as the `platform` option for
-  this operation will instead have precedence.
+  This cannot be used at the same time as `build`; instead, use `build.platform`
 
-- `login` (bool) - This is used to login to dockerhub to pull a private base container. For
-  pushing to dockerhub, see the docker post-processors
+- `login` (bool) - This is used to login to a private docker repository (e.g., dockerhub)
+  to build or pull a private base container. For pushing to a private
+   repository, see the docker post-processors.
 
 - `login_password` (string) - The password to use to authenticate to login.
 
 - `login_server` (string) - The server address to login to.
 
 - `login_username` (string) - The username to use to authenticate to login.
 
-- `ecr_login` (bool) - Defaults to false. If true, the builder will login in order to pull the
-  image from Amazon EC2 Container Registry (ECR). The builder only logs in
-  for the duration of the pull. If true login_server is required and
-  login, login_username, and login_password will be ignored. For more
-  information see the section on ECR.
+- `ecr_login` (bool) - Defaults to false. If true, the builder will login in order to build or
+  pull the image from Amazon EC2 Container Registry (ECR). The builder
+  only logs in for the duration of the build or pull step. If true,
+  login_server is required and login, login_username, and login_password
+  will be ignored. For more information see the section on ECR.
 
 <!-- End of code generated from the comments of the Config struct in builder/docker/config.go; -->
 
@@ -393,6 +393,9 @@ source "docker" "example" {
 
   Defaults to the directory from which we invoke packer.
 
+- `arguments` (map[string]string) - A mapping of additional build args to provide. The key of
+  the object is the argument name, the value is the argument value.
+
 - `platform` (string) - Set platform if server is multi-platform capable
 
 - `pull` (boolean) - Pull the image when building the base docker image.

builder/docker/builder_acc_test.go

@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package docker
 
 import (

builder/docker/config.go

@@ -144,20 +144,21 @@ type Config struct {
 	// This cannot be used at the same time as `build`; instead, use `build.platform`
 	Platform string `mapstructure:"platform" required:"false"`
 
-	// This is used to login to dockerhub to pull a private base container. For
-	// pushing to dockerhub, see the docker post-processors
+	// This is used to login to a private docker repository (e.g., dockerhub)
+	// to build or pull a private base container. For pushing to a private
+	//  repository, see the docker post-processors.
 	Login bool `mapstructure:"login" required:"false"`
 	// The password to use to authenticate to login.
 	LoginPassword string `mapstructure:"login_password" required:"false"`
 	// The server address to login to.
 	LoginServer string `mapstructure:"login_server" required:"false"`
 	// The username to use to authenticate to login.
 	LoginUsername string `mapstructure:"login_username" required:"false"`
-	// Defaults to false. If true, the builder will login in order to pull the
-	// image from Amazon EC2 Container Registry (ECR). The builder only logs in
-	// for the duration of the pull. If true login_server is required and
-	// login, login_username, and login_password will be ignored. For more
-	// information see the section on ECR.
+	// Defaults to false. If true, the builder will login in order to build or
+	// pull the image from Amazon EC2 Container Registry (ECR). The builder
+	// only logs in for the duration of the build or pull step. If true,
+	// login_server is required and login, login_username, and login_password
+	// will be ignored. For more information see the section on ECR.
 	EcrLogin        bool `mapstructure:"ecr_login" required:"false"`
 	AwsAccessConfig `mapstructure:",squash"`
 

builder/docker/dockerfile_config.go

@@ -31,10 +31,14 @@ type DockerfileBootstrapConfig struct {
 	//
 	// Defaults to the directory from which we invoke packer.
 	BuildDir string `mapstructure:"build_dir"`
-
+
+	// A mapping of additional build args to provide. The key of
+	// the object is the argument name, the value is the argument value.
+	Arguments map[string]string `mapstructure:"arguments" required:"false"`
+
 	// Set platform if server is multi-platform capable
 	Platform string `mapstructure:"platform" required:"false"`
-	
+
 	// Pull the image when building the base docker image.
 	//
 	// Note: defaults to true, to disable this, explicitly set it to false.
@@ -101,6 +105,12 @@ func (c DockerfileBootstrapConfig) BuildArgs() []string {
 		retArgs = append(retArgs, "--compress")
 	}
 
+	// Loops through map of build arguments to add to build command
+	for key, value := range c.Arguments {
+		arg := key + "=" + value
+		retArgs = append(retArgs, "--build-arg", arg)
+	}
+
 	return append(retArgs, c.BuildDir)
 }
 

builder/docker/driver_docker.go

@@ -45,6 +45,7 @@ func (d *DockerDriver) Build(args []string) (string, error) {
 	imageIdFilePath := imageIdFile.Name()
 	imageIdFile.Close()
 
+	log.Printf("Building container with args: %v", args)
 	cmd := exec.Command(d.Executable, "build")
 	cmd.Args = append(cmd.Args, "--iidfile", imageIdFilePath)
 	cmd.Args = append(cmd.Args, args...)

builder/docker/step_build.go

@@ -1,10 +1,11 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package docker
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"reflect"
 
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
@@ -22,28 +23,60 @@ func (s *stepBuild) Run(ctx context.Context, state multistep.StateBag) multistep
 
 	ui := state.Get("ui").(packer.Ui)
 	driver := state.Get("driver").(Driver)
-	ui.Say("Building base image...")
-
-	imageId, err := driver.Build(s.buildArgs.BuildArgs())
-	if err != nil {
+	config, ok := state.Get("config").(*Config)
+	if !ok {
+		err := fmt.Errorf("error encountered obtaining docker config")
 		state.Put("error", err)
+		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
 
-	ui.Sayf("Finished building base image %q", imageId)
+	ui.Say("Building base image...")
 
-	cfg, ok := state.GetOk("config")
-	if !ok {
-		state.Put("error", errors.New("missing config in state; this is a docker plugin bug, please report upstream"))
-		return multistep.ActionHalt
+	if config.EcrLogin {
+		ui.Message("Fetching ECR credentials...")
+
+		username, password, err := config.EcrGetLogin(config.LoginServer)
+		if err != nil {
+			err := fmt.Errorf("Error fetching ECR credentials: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		config.LoginUsername = username
+		config.LoginPassword = password
 	}
 
-	config, ok := cfg.(*Config)
-	if !ok {
-		state.Put("error", fmt.Errorf("config object set but type (%s) doesn't match. This is a docker plugin bug, please report upstream", reflect.TypeOf(cfg).String()))
+	if config.Login || config.EcrLogin {
+		ui.Message("Logging in...")
+		err := driver.Login(
+			config.LoginServer,
+			config.LoginUsername,
+			config.LoginPassword)
+		if err != nil {
+			err := fmt.Errorf("Error logging in: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		defer func() {
+			ui.Message("Logging out...")
+			if err := driver.Logout(config.LoginServer); err != nil {
+				ui.Error(fmt.Sprintf("Error logging out: %s", err))
+			}
+		}()
+	}
+
+	imageId, err := driver.Build(s.buildArgs.BuildArgs())
+	if err != nil {
+		state.Put("error", err)
 		return multistep.ActionHalt
 	}
 
+	ui.Sayf("Finished building base image %q", imageId)
+
 	config.Image = imageId
 
 	s.ran = true

docs-partials/builder/docker/Config-not-required.mdx

@@ -102,19 +102,20 @@
 
   This cannot be used at the same time as `build`; instead, use `build.platform`
 
-- `login` (bool) - This is used to login to dockerhub to pull a private base container. For
-  pushing to dockerhub, see the docker post-processors
+- `login` (bool) - This is used to login to a private docker repository (e.g., dockerhub)
+  to build or pull a private base container. For pushing to a private
+   repository, see the docker post-processors.
 
 - `login_password` (string) - The password to use to authenticate to login.
 
 - `login_server` (string) - The server address to login to.
 
 - `login_username` (string) - The username to use to authenticate to login.
 
-- `ecr_login` (bool) - Defaults to false. If true, the builder will login in order to pull the
-  image from Amazon EC2 Container Registry (ECR). The builder only logs in
-  for the duration of the pull. If true login_server is required and
-  login, login_username, and login_password will be ignored. For more
-  information see the section on ECR.
+- `ecr_login` (bool) - Defaults to false. If true, the builder will login in order to build or
+  pull the image from Amazon EC2 Container Registry (ECR). The builder
+  only logs in for the duration of the build or pull step. If true,
+  login_server is required and login, login_username, and login_password
+  will be ignored. For more information see the section on ECR.
 
 <!-- End of code generated from the comments of the Config struct in builder/docker/config.go; -->

docs-partials/builder/docker/DockerfileBootstrapConfig-not-required.mdx

@@ -4,6 +4,9 @@
 
   Defaults to the directory from which we invoke packer.
 
+- `arguments` (map[string]string) - A mapping of additional build args to provide. The key of
+  the object is the argument name, the value is the argument value.
+
 - `platform` (string) - Set platform if server is multi-platform capable
 
 - `pull` (boolean) - Pull the image when building the base docker image.

docs/builders/docker.mdx

@@ -43,6 +43,11 @@ source "docker" "example" {
   export_path = "image.tar"
 }
 
+build {
+  sources = ["source.docker.example"]
+}
+```
+
 **JSON**
 
 ```json
@@ -53,11 +58,6 @@ source "docker" "example" {
 }
 ```
 
-build {
-  sources = ["source.docker.example"]
-}
-```
-
 ## Basic Example: Commit
 
 Below is another example, the same as above but instead of exporting the

version/version.go

@@ -6,8 +6,8 @@ package version
 import "github.com/hashicorp/packer-plugin-sdk/version"
 
 var (
-	Version           = "1.1.0"
-	VersionPrerelease = ""
+	Version           = "1.1.1"
+	VersionPrerelease = "dev"
 	VersionMetadata   = ""
 	PluginVersion     = version.NewPluginVersion(Version, VersionPrerelease, VersionMetadata)
 )