Improved Dockerfile and Makefile

closes #6

Dockerfile

@@ -1,10 +1,14 @@
-FROM scratch
+FROM alpine
 
 VOLUME /data
 EXPOSE 3000
-ENTRYPOINT ["/cloudkeys-go"]
+ENV GOPATH /go
+ENTRYPOINT ["/go/bin/cloudkeys-go"]
 CMD ["--storage=local:////data", "--password-salt=changeme", "--username-salt=changeme"]
 
-ADD https://rootcastore.hub.luzifer.io/v1/store/latest /etc/ssl/ca-bundle.pem
+ADD . /go/src/github.com/Luzifer/cloudkeys-go
-ADD ./cloudkeys-go /cloudkeys-go
+WORKDIR /go/src/github.com/Luzifer/cloudkeys-go
-ADD ./templates /templates
+RUN apk --update add go git ca-certificates \
+ && go get github.com/tools/godep \
+ && /go/bin/godep go install -ldflags "-X main.version=$(git describe --tags)" \
+ && apk --purge del git go

Makefile

@@ -2,13 +2,12 @@ VERSION = $(shell git describe --tags)
 
 default: build
 
-build: bundle_assets
+build: $(GOPATH)/bin/godep bindata.go
-	go build .
+	$(GOPATH)/bin/godep go build -ldflags "-X main.version=$(VERSION)" .
 
-pre-commit: bundle_assets
+pre-commit: bindata.go
 
-container: bundle_assets
+container: bindata.go
-	docker run -v $(CURDIR):/src -e LDFLAGS='-X main.version $(VERSION)' centurylink/golang-builder:latest
 	docker build .
 
 gen_css:
@@ -17,5 +16,8 @@ gen_css:
 gen_js:
 	coffee --compile -o assets coffee/*.coffee
 
-bundle_assets: gen_css gen_js
+bindata.go: gen_css gen_js
-	go-bindata assets templates
+	go generate
+
+$(GOPATH)/bin/godep:
+	go get github.com/tools/godep

main.go

@@ -1,5 +1,7 @@
 package main // import "github.com/Luzifer/cloudkeys-go"
 
+//go:generate go-bindata assets templates
+
 import (
 	"crypto/sha1"
 	"fmt"