Ignore Dockerfile/Compose files by default (#1013)

* Ignore Dockerfile by default

* Ignore compose include files

Author: lionello

src/pkg/cli/compose/context.go

@@ -39,26 +39,33 @@ const (
 	ContextSizeSoftLimit        = 10 * MiB
 	DefaultContextSizeHardLimit = 100 * MiB
 
-	sourceDateEpoch     = 315532800 // 1980-01-01, same as nix-shell
+	sourceDateEpoch = 315532800 // 1980-01-01, same as nix-shell
+	// The default .dockerignore for projects that don't have one. Keep in sync with upload.ts in pulumi-defang repo.
 	defaultDockerIgnore = `# Default .dockerignore file for Defang
-**/.DS_Store
+**/__pycache__
 **/.direnv
+**/.DS_Store
 **/.envrc
 **/.git
 **/.github
 **/.idea
 **/.next
 **/.vscode
-**/__pycache__
+**/compose.*.yaml
+**/compose.*.yml
 **/compose.yaml
 **/compose.yml
-**/defang.exe
-**/docker-compose.yml
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
 **/docker-compose.yaml
+**/docker-compose.yml
 **/node_modules
 **/Thumbs.db
+Dockerfile
+*.Dockerfile
 # Ignore our own binary, but only in the root to avoid ignoring subfolders
 defang
+defang.exe
 # Ignore our project-level state
 .defang`
 )

src/pkg/cli/compose/context_test.go

@@ -109,6 +109,25 @@ func TestWalkContextFolder(t *testing.T) {
 			t.Fatal("WalkContextFolder() should have failed")
 		}
 	})
+
+	t.Run("Default .dockerignore", func(t *testing.T) {
+		var files []string
+		err := WalkContextFolder("../../../testdata/alttestproj", "", func(path string, de os.DirEntry, slashPath string) error {
+			if strings.Contains(slashPath, "alttestproj") {
+				t.Errorf("Path is not relative: %v", slashPath)
+			}
+			files = append(files, slashPath)
+			return nil
+		})
+		if err != nil {
+			t.Fatalf("WalkContextFolder() failed: %v", err)
+		}
+
+		expected := []string{"Dockerfile", "altcomp.yaml", "compose.yaml.fixup", "compose.yaml.golden", "compose.yaml.warnings"}
+		if !reflect.DeepEqual(files, expected) {
+			t.Errorf("Expected files: %v, got %v", expected, files)
+		}
+	})
 }
 
 func TestCreateTarballReader(t *testing.T) {

src/testdata/alttestproj/ignored.Dockerfile

@@ -0,0 +1,2 @@
+# This file should not be included in the build context
+FROM scratch