Store ember app in 'app' folder

.dockerignore

@@ -1,3 +1,3 @@
 *
-!gui
+!app
 !surreal

.gitignore

@@ -37,6 +37,7 @@ surreal.db
 # Other
 # -----------------------------------
 
+app/
 dev/
 vendor/
 node_modules/

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.4
 
 RUN apk add --no-cache ca-certificates
 
-ADD gui gui/
+ADD app app/
 ADD surreal .
 
 EXPOSE 8000 33693

Makefile

@@ -99,3 +99,15 @@ install: clean
 install: glide
 install:
 	CGO_ENABLED=0 $(GO) install -a -v -ldflags '$(LDF)'
+
+# The `make ember` command compiles
+# the ember project, and outputs
+# the build files in the app folder.
+
+.PHONY: ember
+ember: 
+	# npm install -g bower
+	# npm install -g ember-cli
+	cd gui && npm cache clean && bower cache clean
+	# cd gui && npm install && bower install
+	cd gui && ember build -prod -o ../app/

circle.yml

@@ -32,12 +32,7 @@ checkout:
 
 dependencies:
     override:
-        - cd gui/
+        - docker info
-        - npm install -g bower
-        - npm install -g ember-cli
-        - npm cache clean && bower cache clean
-        - npm install && bower install
-        - ember build -prod
         - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
         - go get -u github.com/Masterminds/glide
 
@@ -47,6 +42,7 @@ test:
     override:
         - make test
         - make build
+        - make ember
         - docker build -t abcum/surreal .
         - docker run -d abcum/surreal start; sleep 15
 

web/routes.go

@@ -34,7 +34,7 @@ func output(c *fibre.Context, res interface{}) error {
 
 func routes(s *fibre.Fibre) {
 
-	s.Dir("/", "gui/dist/")
+	s.Dir("/", "app/")
 
 	// --------------------------------------------------
 	// Endpoint for health checks