1 files changed, 25 insertions, 6 deletions
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 9fae39df0..0cafbb2aa 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -10,13 +10,13 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"text/template"
 	"time"
 
-	v1 "k8s.io/api/core/v1"
-
 	"github.com/containers/buildah/imagebuildah"
+	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/image/docker/reference"
 	"github.com/containers/image/types"
 	"github.com/containers/libpod/cmd/podman/cliconfig"
@@ -32,6 +32,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/varlink/go/varlink"
+	v1 "k8s.io/api/core/v1"
 )
 
 // ImageRuntime is wrapper for image runtime
@@ -68,6 +69,12 @@ func GetRuntime(ctx context.Context, c *cliconfig.PodmanCommand) (*LocalRuntime,
 		cmd:    c.GlobalFlags,
 	}
 	configPath := remoteclientconfig.GetConfigFilePath()
+	// Check if the basedir for configPath exists and if not, create it.
+	if _, err := os.Stat(filepath.Dir(configPath)); os.IsNotExist(err) {
+		if mkdirErr := os.MkdirAll(filepath.Dir(configPath), 0750); mkdirErr != nil {
+			return nil, mkdirErr
+		}
+	}
 	if len(c.GlobalFlags.RemoteConfigFilePath) > 0 {
 		configPath = c.GlobalFlags.RemoteConfigFilePath
 		customConfig = true
@@ -820,9 +827,13 @@ func (r *LocalRuntime) Events(c *cliconfig.EventValues) error {
 	}
 
 	w := bufio.NewWriter(os.Stdout)
-	tmpl, err := template.New("events").Parse(c.Format)
-	if err != nil {
-		return err
+	var tmpl *template.Template
+	if c.Format != formats.JSONString {
+		template, err := template.New("events").Parse(c.Format)
+		if err != nil {
+			return err
+		}
+		tmpl = template
 	}
 
 	for {
@@ -856,7 +867,15 @@ func (r *LocalRuntime) Events(c *cliconfig.EventValues) error {
 			Time:   eTime,
 			Type:   eType,
 		}
-		if len(c.Format) > 0 {
+		if c.Format == formats.JSONString {
+			jsonStr, err := event.ToJSONString()
+			if err != nil {
+				return errors.Wrapf(err, "unable to format json")
+			}
+			if _, err := w.Write([]byte(jsonStr)); err != nil {
+				return err
+			}
+		} else if len(c.Format) > 0 {
 			if err := tmpl.Execute(w, event); err != nil {
 				return err
 			}