Merge pull request #197 from moul/dev/moul/docker-static

chore: embed static content in docker

.gitignore

@@ -6,3 +6,5 @@ coverage.txt
 .#*
 depviz.db
 /vendor/
+packrd/
+*-packr.go

Dockerfile

@@ -6,11 +6,13 @@ ARG             VERSION
 # build
 FROM            golang:1.13-alpine as build
 RUN             apk add --update --no-cache git gcc musl-dev make
+RUN             GO111MODULE=off go get github.com/gobuffalo/packr/v2/packr2
 WORKDIR         /go/src/moul.io/depviz
 ENV             GO111MODULE=on
 COPY            go.* ./
 RUN             go mod download
 COPY            . ./
+RUN             make packr
 RUN             make install
 
 # minimalist runtime

Makefile

@@ -65,3 +65,9 @@ generate_local:
 .PHONY: clean
 clean:
 	rm -f gen.sum $(wildcard */*/*.pb.go */*/*.pb.gw.go) $(wildcard out/*)
+
+
+.PHONY: packr
+packr:
+	GO111MODULE=off go get github.com/gobuffalo/packr/v2/packr2
+	cd internal/dvserver && packr2

internal/dvserver/server.go

@@ -13,7 +13,7 @@ import (
 	"github.com/cayleygraph/cayley/schema"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
-	"github.com/gobuffalo/packr/v2"
+	packr "github.com/gobuffalo/packr/v2"
 	"github.com/gogo/gateway"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
@@ -196,7 +196,7 @@ func New(ctx context.Context, h *cayley.Handle, schema *schema.Config, opts Opts
 		}
 
 		// static content
-		box := packr.New("web", "./web")
+		box := packr.New("web", "../../web")
 		chiutil.FileServer(r, "/", box)
 
 		http.DefaultServeMux = http.NewServeMux() // disables default handlers registere by importing net/http/pprof for security reasons