Merge pull request #10 from ibuildthecloud/revert-7-master

Revert "Systemd-docker client detaches if -d option is given by user"

Author: ibuildthecloud

main.go

@@ -43,7 +43,6 @@ type Context struct {
 	Pid          int
 	PidFile      string
 	Client       *dockerClient.Client
-	Detach       bool
 }
 
 func setupEnvironment(c *Context) {
@@ -83,7 +82,6 @@ func parseContext(args []string) (*Context, error) {
 	flags.BoolVar(&c.Notify, []string{"n", "-notify"}, false, "setup systemd notify for container")
 	flags.BoolVar(&c.Env, []string{"e", "-env"}, false, "inherit environment variable")
 	flags.Var(&flCgroups, []string{"c", "-cgroups"}, "cgroups to take ownership of or 'all' for all cgroups available")
-	flags.BoolVar(&c.Detach, []string{"d", "-detach"}, false, "detach from container")
 
 	err := flags.Parse(args)
 	if err != nil {
@@ -552,18 +550,16 @@ func mainWithArgs(args []string) (*Context, error) {
 		return c, err
 	}
 
-	if !c.Detach {
-		go pipeLogs(c)
+	go pipeLogs(c)
 
-		err = keepAlive(c)
-		if err != nil {
-			return c, err
-		}
+	err = keepAlive(c)
+	if err != nil {
+		return c, err
+	}
 
-		err = rmContainer(c)
-		if err != nil {
-			return c, err
-		}
+	err = rmContainer(c)
+	if err != nil {
+		return c, err
 	}
 
 	return c, nil