check if ship yml

replicatedhq · Nov 6, 2018 · 41f1d95 · 41f1d95
1 parent 5dcc2ff
commit 41f1d95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pkg/specs/apptype/determine_type.go b/pkg/specs/apptype/determine_type.go
@@ -79,6 +79,7 @@ func (r *inspector) DetermineApplicationType(
 	}
 
 	upstream, subdir, isSingleFile := gogetter.UntreeGithub(upstream)
+	isSingleFile = gogetter.IsShipYaml(upstream)
 	if gogetter.IsGoGettable(upstream) {
 		// get with go-getter
 		fetcher := gogetter.GoGetter{Logger: r.logger, FS: r.fs, Subdir: subdir, IsSingleFile: isSingleFile}
@@ -137,10 +138,9 @@ func (r *inspector) determineTypeFromContents(
 		if err != nil {
 			return "", "", errors.Wrapf(err, "check for %s", filename)
 		}
-	}
-
-	if isReplicatedApp {
-		return "inline.replicated.app", finalPath, nil
+		if isReplicatedApp {
+			return "inline.replicated.app", finalPath, nil
+		}
 	}
 
 	// if there's a Chart.yaml, assume its a chart

diff --git a/pkg/specs/gogetter/go_getter.go b/pkg/specs/gogetter/go_getter.go
@@ -96,3 +96,8 @@ func UntreeGithub(path string) (string, string, bool) {
 	}
 	return fmt.Sprintf("github.com/%s/%s?ref=%s//", githubURL.Owner, githubURL.Repo, githubURL.Ref), githubURL.Subdir, githubURL.IsBlob
 }
+
+func IsShipYaml(path string) bool {
+	base := filepath.Base(path)
+	return base == "ship.yaml" || base == "ship.yml"
+}