3 files changed, 31 insertions, 3 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index f945c9c54..6c91bedfe 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -3,6 +3,7 @@ package common
 import (
 	"fmt"
 	"net"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -13,6 +14,7 @@ import (
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/containers/podman/v3/pkg/rootless"
 	"github.com/containers/podman/v3/pkg/specgen"
+	"github.com/pkg/errors"
 )
 
 type ContainerCLIOpts struct {
@@ -395,8 +397,16 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 			cliOpts.Ulimit = ulimits
 		}
 	}
+	if cc.HostConfig.Resources.NanoCPUs > 0 {
+		if cliOpts.CPUPeriod != 0 || cliOpts.CPUQuota != 0 {
+			return nil, nil, errors.Errorf("NanoCpus conflicts with CpuPeriod and CpuQuota")
+		}
+		cliOpts.CPUPeriod = 100000
+		cliOpts.CPUQuota = cc.HostConfig.Resources.NanoCPUs / 10000
+	}
 
 	// volumes
+	volSources := make(map[string]bool)
 	volDestinations := make(map[string]bool)
 	for _, vol := range cc.HostConfig.Binds {
 		cliOpts.Volume = append(cliOpts.Volume, vol)
@@ -407,6 +417,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 		case 1:
 			volDestinations[vol] = true
 		default:
+			volSources[splitVol[0]] = true
 			volDestinations[splitVol[1]] = true
 		}
 	}
@@ -421,6 +432,19 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 		}
 		cliOpts.Volume = append(cliOpts.Volume, vol)
 	}
+	// Make mount points for compat volumes
+	for vol := range volSources {
+		// This might be a named volume.
+		// Assume it is if it's not an absolute path.
+		if !filepath.IsAbs(vol) {
+			continue
+		}
+		if err := os.MkdirAll(vol, 0755); err != nil {
+			if !os.IsExist(err) {
+				return nil, nil, errors.Wrapf(err, "error making volume mountpoint for volume %s", vol)
+			}
+		}
+	}
 	if len(cc.HostConfig.BlkioWeightDevice) > 0 {
 		devices := make([]string, 0, len(cc.HostConfig.BlkioWeightDevice))
 		for _, d := range cc.HostConfig.BlkioWeightDevice {
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index 7887e9539..7a62d982c 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -189,8 +189,9 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 		}
 
 		putOptions := buildahCopiah.PutOptions{
-			ChownDirs:  &idPair,
-			ChownFiles: &idPair,
+			ChownDirs:     &idPair,
+			ChownFiles:    &idPair,
+			IgnoreDevices: true,
 		}
 		if !containerInfo.IsDir && (!hostInfo.IsDir || hostInfoErr != nil) {
 			// If we're having a file-to-file copy, make sure to
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 0e1c47399..de532ed78 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -265,6 +265,9 @@ func build(cmd *cobra.Command, args []string) error {
 	}
 
 	report, err := registry.ImageEngine().Build(registry.GetContext(), containerFiles, *apiBuildOpts)
+	if err != nil {
+		return err
+	}
 
 	if cmd.Flag("iidfile").Changed {
 		f, err := os.Create(buildOpts.Iidfile)
@@ -276,7 +279,7 @@ func build(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	return err
+	return nil
 }
 
 // buildFlagsWrapperToOptions converts the local build flags to the build options used