systemd-docker client detaches if user provides -d option

main.go

@@ -43,6 +43,7 @@ type Context struct {
 	Pid          int
 	PidFile      string
 	Client       *dockerClient.Client
+	Detach       bool
 }
 
 func setupEnvironment(c *Context) {
@@ -131,6 +132,7 @@ func parseContext(args []string) (*Context, error) {
 	c.NotifySocket = os.Getenv("NOTIFY_SOCKET")
 	c.Args = newArgs
 	c.Cgroups = flCgroups.GetAll()
+	c.Detach = foundD
 
 	for _, val := range c.Cgroups {
 		if val == "all" {
@@ -550,6 +552,7 @@ func mainWithArgs(args []string) (*Context, error) {
 		return c, err
 	}
 
+  if !c.Detach {
     go pipeLogs(c)
   
   	err = keepAlive(c)
@@ -561,6 +564,7 @@ func mainWithArgs(args []string) (*Context, error) {
   	if err != nil {
   		return c, err
   	}
+  }
 
 	return c, nil
 }