Update docker and makefile to use mrfusion

Dockerfile

@@ -0,0 +1,11 @@
+FROM gliderlabs/alpine
+MAINTAINER Chris Goller <chris@influxdb.com>
+
+RUN apk add --update ca-certificates && \
+    rm /var/cache/apk/*
+
+ADD mrfusion /mrfusion
+
+EXPOSE 8888
+
+CMD ["/mrfusion", "--port=8888"]

Makefile

@@ -16,6 +16,8 @@ ${BINARY}: $(SOURCES)
 docker-${BINARY}: $(SOURCES)
 	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o ${BINARY} ${LDFLAGS} \
 		./cmd/mr-fusion-server/main.go
+docker: docker-${BINARY}
+	docker build -t mrfusion .
 
 assets:
 	mkdir -p ui/build
@@ -34,4 +36,7 @@ clean:
 test:
 	go test -race ./...
 
-.PHONY: clean test
+run:
+	./mrfusion --port 8888
+
+.PHONY: clean test run

README.md

@@ -1,4 +1,10 @@
 # mrfusion
+
+## Builds
+To build assets and the go server, run `make`.
+To run server either `./mrfusion --port 8888` or `make run`
+
+## Deployment (for now)
 Includes a Dockerfile that builds a container suitable for Heroku.
 
 In order to push to heroku, make sure you've logged into Heroku normally with...

circle.yml

@@ -15,3 +15,13 @@ dependencies:
 test:
   override:
     - make test
+
+deployment:
+  heroku:
+    branch: develop
+    commands:
+      - make docker
+      - docker login -e $HEROKU_EMAIL -u $HEROKU_EMAIL -p $HEROKU_PASS registry.heroku.com
+      - docker tag mrfusion registry.heroku.com/mrfusion-acc/web
+      - docker push registry.heroku.com/mrfusion-acc/web
+