backport of commit b69f141

.copywrite.hcl

@@ -7,8 +7,5 @@ project {
   header_ignore = [
     "command/asset/*.hcl",
     "command/agent/bindata_assetfs.go",
-    // Enterprise files do not fall under the open source licensing. OSS-ENT
-    // merge conflicts might happen here, please be sure to put new OSS
-    // exceptions above this comment.
   ]
 }

GNUmakefile

@@ -53,7 +53,6 @@ ALL_TARGETS = linux_386 \
 	linux_amd64 \
 	linux_arm \
 	linux_arm64 \
-	linux_s390x \
 	windows_386 \
 	windows_amd64
 endif

drivers/docker/config.go

@@ -740,7 +740,7 @@ func (d *Driver) SetConfig(c *base.Config) error {
 	if len(d.config.PullActivityTimeout) > 0 {
 		dur, err := time.ParseDuration(d.config.PullActivityTimeout)
 		if err != nil {
-			return fmt.Errorf("failed to parse 'pull_activity_timeout' duration: %v", err)
+			return fmt.Errorf("failed to parse 'pull_activity_timeout' duaration: %v", err)
 		}
 		if dur < pullActivityTimeoutMinimum {
 			return fmt.Errorf("pull_activity_timeout is less than minimum, %v", pullActivityTimeoutMinimum)
@@ -751,7 +751,7 @@ func (d *Driver) SetConfig(c *base.Config) error {
 	if d.config.InfraImagePullTimeout != "" {
 		dur, err := time.ParseDuration(d.config.InfraImagePullTimeout)
 		if err != nil {
-			return fmt.Errorf("failed to parse 'infra_image_pull_timeout' duration: %v", err)
+			return fmt.Errorf("failed to parse 'infra_image_pull_timeout' duaration: %v", err)
 		}
 		d.config.infraImagePullTimeoutDuration = dur
 	}

drivers/docker/utils.go

@@ -103,7 +103,7 @@ func authFromTaskConfig(driverConfig *TaskConfig) authBackend {
 }
 
 // authFromDockerConfig generate an authBackend for a dockercfg-compatible file.
-// The authBackend can either be from explicit auth definitions or via credential
+// The authBacken can either be from explicit auth definitions or via credential
 // helpers
 func authFromDockerConfig(file string) authBackend {
 	return func(repo string) (*docker.AuthConfiguration, error) {

e2e/example/input/env.hcl

@@ -23,6 +23,7 @@ job "env" {
     }
 
     task "task" {
+      user   = "nobody"
       driver = "raw_exec"
 
       config {

e2e/example/input/sleep.hcl

@@ -28,6 +28,7 @@ job "sleep" {
     }
 
     task "task" {
+      user   = "nobody"
       driver = "raw_exec"
 
       config {