Allow callers to replace the ContainerPrefix

This idea of this PR is to allow Podman to add a Podman
prefix to containers. This would allow it to keep track
of containers created by Podman and make it easier to remove
them when it wants to remove all.

Signed-off-by: Daniel J Walsh <[email protected]>

define/build.go

@@ -80,6 +80,8 @@ type CommonBuildOptions struct {
 
 // BuildOptions can be used to alter how an image is built.
 type BuildOptions struct {
+	// ContainerPrefix it the name to prefix containers with
+	ContainerPrefix string
 	// ContextDirectory is the default source location for COPY and ADD
 	// commands.
 	ContextDirectory string

imagebuildah/executor.go

@@ -57,6 +57,7 @@ var builtinAllowedBuildArgs = map[string]bool{
 // interface.  It coordinates the entire build by using one or more
 // StageExecutors to handle each stage of the build.
 type Executor struct {
+	containerPrefix                string
 	logger                         *logrus.Logger
 	stages                         map[string]*StageExecutor
 	store                          storage.Store
@@ -205,6 +206,7 @@ func newExecutor(logger *logrus.Logger, logPrefix string, store storage.Store, o
 	}
 
 	exec := Executor{
+		containerPrefix:                options.ContainerPrefix,
 		logger:                         logger,
 		stages:                         make(map[string]*StageExecutor),
 		store:                          store,

imagebuildah/stage_executor.go

@@ -539,6 +539,7 @@ func (s *StageExecutor) prepare(ctx context.Context, from string, initializeIBCo
 		Args:                  ib.Args,
 		FromImage:             from,
 		PullPolicy:            pullPolicy,
+		Container:             s.executor.containerPrefix,
 		Registry:              s.executor.registry,
 		BlobDirectory:         s.executor.blobDirectory,
 		SignaturePolicyPath:   s.executor.signaturePolicyPath,

new.go

@@ -206,13 +206,11 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
 	}
 	var container *storage.Container
 	tmpName := name
-	if options.Container == "" {
-		containers, err := store.Containers()
-		if err != nil {
-			return nil, errors.Wrapf(err, "unable to check for container names")
-		}
-		tmpName = findUnusedContainer(tmpName, containers)
+	containers, err := store.Containers()
+	if err != nil {
+		return nil, errors.Wrapf(err, "unable to check for container names")
 	}
+	tmpName = findUnusedContainer(tmpName, containers)
 
 	conflict := 100
 	for {