Merge pull request #181 from cdr/hats

Nathan Potter · web-flow · commit d8a2de9417e3 · 2019-05-23T11:28:56.000-05:00
Resolve hat path when applying a hat
diff --git a/hat-examples/fish/Dockerfile b/hat-examples/fish/Dockerfile
@@ -1,6 +1,6 @@
 FROM codercom/ubuntu-dev
 
-RUN sudo apt-get -y install fish
+RUN sudo apt-get update && sudo apt-get -y install fish
 RUN sudo chsh user -s $(which fish)
 
 LABEL share.fish="~/.config/fish:~/.config/fish"
diff --git a/hat_builder.go b/hat_builder.go
@@ -52,7 +52,12 @@ func (b *hatBuilder) resolveHatPath() (string, error) {
 		return hat.ResolveGitHubPath(hatPath)
 	}
 
-	return hatPath, nil
+	hostHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+
+	return resolvePath(hostHomeDir, hatPath), nil
 }
 
 // applyHat applies the hat to the base image.
diff --git a/runcmd.go b/runcmd.go
@@ -248,6 +248,9 @@ func (c *runcmd) build(gf *globalFlags, proj *project, b *hatBuilder, r *runner)
 	image := b.baseImage
 	if b.hatPath != "" {
 		image, err = b.applyHat()
+		if err != nil {
+			return err
+		}
 	}
 
 	// TODO proxy if container already exists.

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,12 @@ func (b *hatBuilder) resolveHatPath() (string, error) {`
`52`	`52`	`return hat.ResolveGitHubPath(hatPath)`
`53`	`53`	`}`
`54`	`54`
`55`		`- return hatPath, nil`
	`55`	`+ hostHomeDir, err := os.UserHomeDir()`
	`56`	`+ if err != nil {`
	`57`	`+ return "", err`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ return resolvePath(hostHomeDir, hatPath), nil`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`// applyHat applies the hat to the base image.`
Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,9 @@ func (c runcmd) build(gf globalFlags, proj project, b hatBuilder, r *runner)`
`248`	`248`	`image := b.baseImage`
`249`	`249`	`if b.hatPath != "" {`
`250`	`250`	`image, err = b.applyHat()`
	`251`	`+ if err != nil {`
	`252`	`+ return err`
	`253`	`+ }`
`251`	`254`	`}`
`252`	`255`
`253`	`256`	`// TODO proxy if container already exists.`