Fix Containerfile/Dockerfile lookup to favor source files instead of …

…spec files
claceio · Sep 23, 2024 · 1968063 · 1968063
1 parent b8aa732
commit 1968063
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -422,13 +422,26 @@ func (a *App) loadContainerManager(stripAppPath bool) error {
 	var fileName string
 	switch src {
 	case types.CONTAINER_SOURCE_AUTO:
-		if _, cfErr := a.sourceFS.Stat(CONTAINERFILE); cfErr == nil {
+		// Look for a file in the source fs (ignoring spec). If not found,
+		// look in spec files also.
+		if _, err := a.sourceFS.StatNoSpec(CONTAINERFILE); err == nil {
 			fileName = CONTAINERFILE
 		} else {
-			if _, dErr := a.sourceFS.Stat(DOCKERFILE); dErr == nil {
+			if _, err := a.sourceFS.StatNoSpec(DOCKERFILE); err == nil {
 				fileName = DOCKERFILE
 			}
 		}
+
+		if fileName == "" {
+			// Containerfile/Dockerfile not found in source, check in spec files also
+			if _, err := a.sourceFS.Stat(CONTAINERFILE); err == nil {
+				fileName = CONTAINERFILE
+			} else {
+				if _, err := a.sourceFS.Stat(DOCKERFILE); err == nil {
+					fileName = DOCKERFILE
+				}
+			}
+		}
 	case types.CONTAINER_SOURCE_NIXPACKS:
 		return fmt.Errorf("nixpacks container source not supported yet")
 	default:

diff --git a/internal/app/appfs/disk_fs.go b/internal/app/appfs/disk_fs.go
@@ -121,6 +121,11 @@ func (d *DiskReadFS) Stat(name string) (fs.FileInfo, error) {
 	return fi, err
 }
 
+func (d *DiskReadFS) StatNoSpec(name string) (fs.FileInfo, error) {
+	absName := d.makeAbsolute(name)
+	return os.Stat(absName)
+}
+
 func (d *DiskReadFS) Glob(pattern string) (matches []string, err error) {
 	// TODO glob does not look at spec files
 	return fs.Glob(d.fs, pattern)

diff --git a/internal/app/appfs/source_fs.go b/internal/app/appfs/source_fs.go
@@ -28,6 +28,7 @@ type ReadableFS interface {
 	fs.GlobFS
 	// Stat returns the stats for the named file.
 	Stat(name string) (fs.FileInfo, error)
+	StatNoSpec(name string) (fs.FileInfo, error)   // Stat the FS without looking at spec files
 	Reset()                                        // Used to reset the file system transaction for the DbFs, no-op for others
 	StaticFiles() []string                         // Return list of static files
 	FileHash(excludeGlob []string) (string, error) // Return a hash of the source file contents

diff --git a/internal/app/tests/app_test_helper.go b/internal/app/tests/app_test_helper.go
@@ -217,6 +217,10 @@ func (f *TestReadFS) Stat(name string) (fs.FileInfo, error) {
 	return &TestFileInfo{file}, nil
 }
 
+func (f *TestReadFS) StatNoSpec(name string) (fs.FileInfo, error) {
+	return f.Stat(name)
+}
+
 func (d *TestReadFS) StaticFiles() []string {
 	staticFiles := []string{}
 	for name := range d.fileData {

diff --git a/internal/metadata/dbfs.go b/internal/metadata/dbfs.go
@@ -239,6 +239,14 @@ func (d *DbFs) Stat(name string) (fs.FileInfo, error) {
 	return &fi, nil
 }
 
+func (d *DbFs) StatNoSpec(name string) (fs.FileInfo, error) {
+	fi, ok := d.fileInfo[name]
+	if !ok {
+		return nil, fs.ErrNotExist
+	}
+	return &fi, nil
+}
+
 func (d *DbFs) Glob(pattern string) (matches []string, err error) {
 	matchedFiles := []string{}
 	for name := range d.fileInfo {