Merge pull request #101 from flatrun/fix/bind-mount-file-detection

fix(docker): Distinguish file from directory bind mounts

Author: nfebe

VERSION

@@ -1 +1 @@
-0.1.52
+0.1.53

cmd/agent/setup.go

@@ -16,10 +16,16 @@ import (
 )
 
 type templateMetadata struct {
-	Name     string        `yaml:"name"`
-	Type     string        `yaml:"type"`
-	Category string        `yaml:"category"`
-	Setup    setupManifest `yaml:"setup"`
+	Name     string         `yaml:"name"`
+	Type     string         `yaml:"type"`
+	Category string         `yaml:"category"`
+	Mounts   mountsManifest `yaml:"mounts"`
+	Setup    setupManifest  `yaml:"setup"`
+}
+
+type mountsManifest struct {
+	Dirs  []string `yaml:"dirs"`
+	Files []string `yaml:"files"`
 }
 
 type setupManifest struct {
@@ -172,11 +178,6 @@ func deployInfraService(cfg *config.Config, serviceName, templateID string) erro
 	content = strings.ReplaceAll(content, "${NAME}", serviceName)
 	content = strings.ReplaceAll(content, "${PROXY_NETWORK}", cfg.Infrastructure.DefaultProxyNetwork)
 
-	manager := docker.NewManager(cfg.DeploymentsPath)
-	if err := manager.CreateDeployment(serviceName, content); err != nil {
-		return fmt.Errorf("create deployment: %w", err)
-	}
-
 	meta, err := loadInfraMetadata(templateID)
 	if err != nil {
 		return fmt.Errorf("load metadata: %w", err)
@@ -186,6 +187,11 @@ func deployInfraService(cfg *config.Config, serviceName, templateID string) erro
 		return fmt.Errorf("write template files: %w", err)
 	}
 
+	manager := docker.NewManager(cfg.DeploymentsPath)
+	if err := manager.CreateDeployment(serviceName, content, meta.Mounts.Files); err != nil {
+		return fmt.Errorf("create deployment: %w", err)
+	}
+
 	netManager := networks.NewManager()
 	if err := netManager.EnsureNetwork(cfg.Infrastructure.DefaultProxyNetwork); err != nil {
 		return fmt.Errorf("ensure proxy network: %w", err)

internal/api/server.go

@@ -826,7 +826,7 @@ func (s *Server) createDeployment(c *gin.Context) {
 		req.ComposeContent = s.addContainerNetwork(req.ComposeContent, req.ExistingDatabaseContainer)
 	}
 
-	if err := s.manager.CreateDeployment(req.Name, req.ComposeContent); err != nil {
+	if err := s.manager.CreateDeployment(req.Name, req.ComposeContent, nil); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"error": err.Error(),
 		})

internal/docker/discovery.go

@@ -235,7 +235,7 @@ func (d *Discovery) loadMetadata(path string) (*models.ServiceMetadata, error) {
 	return &metadata, nil
 }
 
-func (d *Discovery) CreateDeployment(name string, composeContent string) error {
+func (d *Discovery) CreateDeployment(name string, composeContent string, fileMounts []string) error {
 	dirPath := filepath.Join(d.basePath, name)
 
 	if err := os.MkdirAll(dirPath, 0755); err != nil {
@@ -246,7 +246,7 @@ func (d *Discovery) CreateDeployment(name string, composeContent string) error {
 	composeContent = d.ensureComposeName(name, composeContent)
 
 	// Pre-create bind mount directories with permissive access for non-root containers
-	if err := d.createBindMountDirs(dirPath, composeContent); err != nil {
+	if err := d.createBindMountDirs(dirPath, composeContent, fileMounts); err != nil {
 		return fmt.Errorf("failed to create mount directories: %w", err)
 	}
 
@@ -255,8 +255,11 @@ func (d *Discovery) CreateDeployment(name string, composeContent string) error {
 }
 
 // createBindMountDirs parses compose content and creates bind mount directories
-// with world-writable permissions to support non-root containers (e.g., Bitnami)
-func (d *Discovery) createBindMountDirs(deploymentPath, composeContent string) error {
+// with world-writable permissions to support non-root containers (e.g., Bitnami).
+// fileMounts lists relative paths (e.g., "./nginx.conf") that are file mounts
+// from template metadata. For paths not in fileMounts, a basename-contains-dot
+// heuristic is used as a fallback to avoid creating files as directories.
+func (d *Discovery) createBindMountDirs(deploymentPath, composeContent string, fileMounts []string) error {
 	var compose struct {
 		Services map[string]struct {
 			Volumes []string `yaml:"volumes"`
@@ -267,19 +270,41 @@ func (d *Discovery) createBindMountDirs(deploymentPath, composeContent string) e
 		return nil // Skip if parse fails, not critical
 	}
 
+	fileMountSet := make(map[string]bool, len(fileMounts))
+	for _, fm := range fileMounts {
+		cleanPath := filepath.Clean(fm)
+		fileMountSet[cleanPath] = true
+		fileMountSet["./"+cleanPath] = true
+	}
+
 	for _, service := range compose.Services {
 		for _, volume := range service.Volumes {
 			hostPath := extractBindMountPath(volume)
 			if hostPath == "" {
 				continue
 			}
 
-			// Only handle relative paths (bind mounts)
 			if !strings.HasPrefix(hostPath, "./") && !strings.HasPrefix(hostPath, "../") {
 				continue
 			}
 
 			fullPath := filepath.Join(deploymentPath, hostPath)
+
+			if _, err := os.Stat(fullPath); err == nil {
+				continue
+			}
+
+			if isFileMount(hostPath, fileMountSet) {
+				parentDir := filepath.Dir(fullPath)
+				if err := os.MkdirAll(parentDir, 0777); err != nil {
+					return err
+				}
+				if err := os.Chmod(parentDir, 0777); err != nil {
+					return err
+				}
+				continue
+			}
+
 			if err := os.MkdirAll(fullPath, 0777); err != nil {
 				return err
 			}
@@ -292,6 +317,28 @@ func (d *Discovery) createBindMountDirs(deploymentPath, composeContent string) e
 	return nil
 }
 
+// isFileMount checks whether a bind mount host path refers to a file.
+// It first checks the metadata-provided fileMounts set, then falls back
+// to a heuristic: if the basename contains a dot and is not a known
+// directory pattern (e.g., conf.d), it's treated as a file.
+func isFileMount(hostPath string, fileMountSet map[string]bool) bool {
+	if fileMountSet[hostPath] {
+		return true
+	}
+
+	base := filepath.Base(hostPath)
+	if !strings.Contains(base, ".") {
+		return false
+	}
+
+	// Known directory suffixes like .d (conf.d, certs.d, etc.)
+	if strings.HasSuffix(base, ".d") {
+		return false
+	}
+
+	return true
+}
+
 // extractBindMountPath extracts the host path from a volume mount string
 // Handles formats: "./path:/container/path" or "./path:/container/path:ro"
 func extractBindMountPath(volume string) string {

internal/docker/discovery_test.go

@@ -148,7 +148,7 @@ services:
 				t.Fatalf("Failed to create deployment path: %v", err)
 			}
 
-			err := d.createBindMountDirs(deploymentPath, tt.composeContent)
+			err := d.createBindMountDirs(deploymentPath, tt.composeContent, nil)
 			if err != nil {
 				t.Fatalf("createBindMountDirs failed: %v", err)
 			}
@@ -193,7 +193,7 @@ services:
       - "8000"
 `
 
-	err = d.CreateDeployment("test-app", composeContent)
+	err = d.CreateDeployment("test-app", composeContent, nil)
 	if err != nil {
 		t.Fatalf("CreateDeployment failed: %v", err)
 	}

internal/docker/manager.go

@@ -124,11 +124,11 @@ func (m *Manager) populateContainerInfo(deployment *models.Deployment) {
 	}
 }
 
-func (m *Manager) CreateDeployment(name string, composeContent string) error {
+func (m *Manager) CreateDeployment(name string, composeContent string, fileMounts []string) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	return m.discovery.CreateDeployment(name, composeContent)
+	return m.discovery.CreateDeployment(name, composeContent, fileMounts)
 }
 
 func (m *Manager) ApplyMountOwnership(name string, mounts []MountOwnership) error {

templates/infra/nginx/metadata.yml

@@ -6,6 +6,15 @@ category: infrastructure
 type: infrastructure
 priority: 100
 
+mounts:
+  dirs:
+    - conf.d
+    - certs
+    - html
+    - lua
+  files:
+    - nginx.conf
+
 setup:
   dirs:
     - conf.d