sorted out --rm/--no-rm options

wabenet · Apr 8, 2018 · ea2a0ed · ea2a0ed
1 parent c6f54a6
commit ea2a0ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pkg/container/container.go b/pkg/container/container.go
@@ -13,6 +13,7 @@ type Options struct {
 	Client      *client.Client
 	Image       string
 	Name        string
+	Remove      bool
 	Interactive bool
 	Interpreter []string
 	Entrypoint  string

diff --git a/pkg/container/create.go b/pkg/container/create.go
@@ -24,7 +24,7 @@ func createContainer(ctx context.Context, options Options) (string, error) {
 			Entrypoint:   getEntrypoint(options),
 		},
 		&container.HostConfig{
-			AutoRemove:  true,
+			AutoRemove:  options.Remove,
 			Binds:       options.Volumes,
 			VolumesFrom: options.VolumesFrom,
 		},

diff --git a/pkg/container/run.go b/pkg/container/run.go
@@ -86,10 +86,14 @@ func runContainer(ctx context.Context, containerID string, options Options) erro
 		}
 	}()
 
+	condition := container.WaitConditionNextExit
+	if options.Remove {
+		condition = container.WaitConditionRemoved
+	}
 	waitChannel, waitErrorChannel := options.Client.ContainerWait(
 		ctx,
 		containerID,
-		container.WaitConditionRemoved,
+		condition,
 	)
 
 	err = options.Client.ContainerStart(