Fix merge

.dockerignore

@@ -0,0 +1,7 @@
+build/
+target/
+node_modules/
+.git*
+.bundler/
+*.log
+bin/

Dockerfile

@@ -0,0 +1,8 @@
+FROM gobuffalo/buffalo:latest
+
+RUN mkdir -p $GOPATH/src/github.com/bscott/golangflow
+WORKDIR $GOPATH/src/github.com/bscott/golangflow
+ADD . .
+RUN npm install
+RUN buffalo build -o bin/app
+CMD ./bin/app

actions/auth.go

@@ -47,3 +47,5 @@ func AuthCallback(c buffalo.Context) error {
 	// Do something with the user, maybe register them/sign them in
 	return c.Render(200, r.JSON(user))
 }
+
+

app.json

@@ -10,3 +10,5 @@
   "addons": ["heroku-postgresql:hobby-dev"],
   "buildpacks": []
 }
+
+

main.go

@@ -14,6 +14,7 @@ func init() {
 	setenv.File(".setenv")
 }
 
+
 func main() {
 	port := envy.Get("PORT", "3000")
 	log.Printf("Starting golangflow on port %s\n", port)