fix java binary mount path

Signed-off-by: Emily McMullan <[email protected]>

cmd/analyze.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"gopkg.in/yaml.v2"
 	"io"
 	"io/fs"
 	"os"
@@ -15,6 +14,8 @@ import (
 	"path"
 	"runtime"
 
+	"gopkg.in/yaml.v2"
+
 	"path/filepath"
 	"slices"
 	"strings"
@@ -872,7 +873,7 @@ func (a *analyzeCommand) RunProviders(ctx context.Context, networkName string, v
 				container.WithContainerToolBin(Settings.ContainerBinary),
 				container.WithEntrypointArgs(args...),
 				container.WithDetachedMode(true),
-				container.WithCleanup(a.cleanup),
+				container.WithCleanup(false),
 				container.WithName(fmt.Sprintf("provider-%v", container.RandomName())),
 				container.WithNetwork(networkName),
 			)
@@ -897,7 +898,7 @@ func (a *analyzeCommand) RunProviders(ctx context.Context, networkName string, v
 				container.WithContainerToolBin(Settings.ContainerBinary),
 				container.WithEntrypointArgs(args...),
 				container.WithDetachedMode(true),
-				container.WithCleanup(a.cleanup),
+				container.WithCleanup(false),
 				container.WithName(fmt.Sprintf("provider-%v", container.RandomName())),
 				container.WithNetwork(fmt.Sprintf("container:%v", a.providerContainerNames[0])),
 			)

cmd/cleanup.go

@@ -79,6 +79,17 @@ func (c *AnalyzeCommandContext) RmProviderContainers(ctx context.Context) error
 				"container", con)
 			continue
 		}
+		cmd = exec.CommandContext(
+			ctx,
+			Settings.ContainerBinary,
+			"rm", con)
+		c.log.V(1).Info("removing provider container", "container", con)
+		err = cmd.Run()
+		if err != nil {
+			c.log.V(1).Error(err, "failed to remove container",
+				"container", con)
+			continue
+		}
 	}
 	return nil
 }

cmd/command-context.go

@@ -2,17 +2,18 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+
 	"github.com/devfile/alizer/pkg/apis/model"
 	"github.com/go-logr/logr"
 	"github.com/konveyor-ecosystem/kantra/pkg/container"
 	"github.com/konveyor/analyzer-lsp/engine"
 	"github.com/phayes/freeport"
 	"gopkg.in/yaml.v2"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
 )
 
 type AnalyzeCommandContext struct {
@@ -189,8 +190,25 @@ func (c *AnalyzeCommandContext) createContainerVolume(inputPath string) (string,
 	if err != nil {
 		return "", err
 	}
+
 	if c.isFileInput {
-		input = filepath.Dir(input)
+		//create temp dir and move bin file to mount
+		file := filepath.Base(input)
+		tempDir, err := os.MkdirTemp("", "java-bin-")
+		if err != nil {
+			c.log.V(1).Error(err, "failed creating temp dir", "dir", tempDir)
+			return "", err
+		}
+		c.log.V(1).Info("created temp directory for Java input file", "dir", tempDir)
+		// for cleanup
+		c.tempDirs = append(c.tempDirs, tempDir)
+
+		err = CopyFileContents(input, filepath.Join(tempDir, file))
+		if err != nil {
+			c.log.V(1).Error(err, "failed copying binary file")
+			return "", err
+		}
+		input = tempDir
 	}
 	if runtime.GOOS == "windows" {
 		// TODO(djzager): Thank ChatGPT