dockerfile changes

Author: bcherry

pkg/agentfs/examples/node.Dockerfile

@@ -38,14 +38,6 @@ COPY . .
 # Build the project
 RUN pnpm exec tsc
 
-# Remove development-only dependencies to reduce the runtime image size
-RUN pnpm prune --prod
-
-# Pre-download any ML models or files the agent needs
-# This ensures the container is ready to run immediately without downloading
-# dependencies at runtime, which improves startup time and reliability
-RUN pnpm exec node dist/agent.js download-files
-
 # Create a non-privileged user that the app will run under
 # See https://docs.docker.com/develop/develop-images/dockerfile_best_practices/#user
 ARG UID=10001
@@ -61,6 +53,16 @@ RUN adduser \
 RUN chown -R appuser:appuser /app
 USER appuser
 
+# Pre-download any ML models or files the agent needs
+# This ensures the container is ready to run immediately without downloading
+# dependencies at runtime, which improves startup time and reliability
+RUN pnpm exec node dist/agent.js download-files
+
+# Remove development-only dependencies to reduce the runtime image size
+USER root
+RUN pnpm prune --prod && chown -R appuser:appuser /app
+USER appuser
+
 # Set Node.js to production mode
 ENV NODE_ENV=production
 

pkg/agentfs/tar.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	pathpkg "path"
 	"path/filepath"
 	"strings"
 
@@ -42,7 +43,6 @@ var (
 	}
 
 	ignoreFilePatterns = []string{
-		".gitignore",
 		".dockerignore",
 	}
 )
@@ -61,8 +61,17 @@ func UploadTarball(directory string, presignedUrl string, excludeFiles []string)
 		}
 	}
 
-	for i, exclude := range excludeFiles {
-		excludeFiles[i] = strings.TrimSpace(exclude)
+	// Normalize and filter ignore patterns
+	{
+		filtered := make([]string, 0, len(excludeFiles))
+		for _, exclude := range excludeFiles {
+			exclude = strings.TrimSpace(exclude)
+			if exclude == "" || strings.HasPrefix(exclude, "#") {
+				continue
+			}
+			filtered = append(filtered, filepath.ToSlash(exclude))
+		}
+		excludeFiles = filtered
 	}
 
 	var totalSize int64
@@ -75,17 +84,19 @@ func UploadTarball(directory string, presignedUrl string, excludeFiles []string)
 		if err != nil {
 			return nil
 		}
+		// Use forward slashes inside tar archives regardless of OS
+		relPath = filepath.ToSlash(relPath)
 
 		for _, exclude := range excludeFiles {
 			if exclude == "" || strings.Contains(exclude, "Dockerfile") {
 				continue
 			}
 			if info.IsDir() {
-				if strings.HasPrefix(relPath, exclude+"/") || strings.HasPrefix(relPath, exclude) {
+				if strings.HasPrefix(relPath, exclude+"/") || relPath == exclude {
 					return filepath.SkipDir
 				}
 			}
-			matched, err := filepath.Match(exclude, relPath)
+			matched, err := pathpkg.Match(exclude, relPath)
 			if err != nil {
 				return nil
 			}
@@ -132,20 +143,22 @@ func UploadTarball(directory string, presignedUrl string, excludeFiles []string)
 		if err != nil {
 			return fmt.Errorf("failed to calculate relative path for %s: %w", path, err)
 		}
+		// Normalize to forward slashes for tar header names and matching
+		relPath = filepath.ToSlash(relPath)
 
 		for _, exclude := range excludeFiles {
 			if exclude == "" || strings.Contains(exclude, "Dockerfile") {
 				continue
 			}
 
 			if info.IsDir() {
-				if strings.HasPrefix(relPath, exclude+"/") || strings.HasPrefix(relPath, exclude) {
+				if strings.HasPrefix(relPath, exclude+"/") || relPath == exclude {
 					logger.Debugw("excluding directory from tarball", "path", path)
 					return filepath.SkipDir
 				}
 			}
 
-			matched, err := filepath.Match(exclude, relPath)
+			matched, err := pathpkg.Match(exclude, relPath)
 			if err != nil {
 				return nil
 			}