Use the app name instead of path

Author: Xayton

internal/orchestrator/provision.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
+	"regexp"
 
 	"github.com/arduino/arduino-app-cli/pkg/parser"
 
@@ -15,6 +16,8 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
+var containerNameInvalidRegex = regexp.MustCompile(`[^a-zA-Z0-9]`)
+
 func ProvisionApp(ctx context.Context, docker *dockerClient.Client, app parser.App) error {
 	if err := pullBasePythonContainer(ctx, pythonImage); err != nil {
 		return fmt.Errorf("provisioning failed to pull base image: %w", err)
@@ -27,7 +30,7 @@ func ProvisionApp(ctx context.Context, docker *dockerClient.Client, app parser.A
 	}, &container.HostConfig{
 		Binds:      []string{app.FullPath.String() + ":/app"},
 		AutoRemove: true,
-	}, nil, nil, app.Name)
+	}, nil, nil, generateContainerName(app.Name))
 	if err != nil {
 		return fmt.Errorf("provisiong failed to create container: %w", err)
 	}
@@ -52,6 +55,17 @@ func ProvisionApp(ctx context.Context, docker *dockerClient.Client, app parser.A
 	return generateMainComposeFile(ctx, app, pythonImage)
 }
 
+// Converts an arbitrary string to one that satisfies the container name requirement: [a-zA-Z0-9][a-zA-Z0-9_.-]
+// See the Docker Engine code here: https://github.com/moby/moby/blob/master/daemon/names/names.go#L6
+func generateContainerName(appName string) string {
+	result := containerNameInvalidRegex.ReplaceAllString(appName, "")
+
+	if len(result) < 1 {
+		result = "c"
+	}
+	return result
+}
+
 func pullBasePythonContainer(ctx context.Context, pythonImage string) error {
 	process, err := paths.NewProcess(nil, "docker", "pull", pythonImage)
 	if err != nil {

pkg/parser/app.go

@@ -32,7 +32,6 @@ func Load(appPath string) (App, error) {
 	}
 
 	app := App{
-		Name:       path.Base(),
 		FullPath:   path,
 		Descriptor: Descriptor{},
 	}
@@ -43,6 +42,7 @@ func Load(appPath string) (App, error) {
 			return App{}, fmt.Errorf("error loading app descriptor file: %w", err)
 		}
 		app.Descriptor = desc
+		app.Name = desc.DisplayName
 	} else {
 		return App{}, errors.New("descriptor app.yaml file missing from app")
 	}