start of generating assets

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>

.gitignore

@@ -46,7 +46,6 @@ reg
 testreg
 .certs
 cross/
-internal/
 server/static/index.html
 server/static/repo/
 

internal/binutils/generate.go

@@ -0,0 +1,27 @@
+// +build ignore
+
+package main
+
+import (
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/shurcooL/vfsgen"
+	"github.com/sirupsen/logrus"
+)
+
+func main() {
+	wd, err := os.Getwd()
+	if err != nil {
+		logrus.Fatal(err)
+	}
+	assets := http.Dir(filepath.Join(wd, "server/static"))
+	if err := vfsgen.Generate(assets, vfsgen.Options{
+		Filename:     filepath.Join(wd, "internal/binutils", "static.go"),
+		PackageName:  "binutils",
+		VariableName: "Assets",
+	}); err != nil {
+		logrus.Fatal(err)
+	}
+}

main.go

@@ -30,6 +30,7 @@ var (
 	debug bool
 )
 
+//go:generate go run internal/binutils/generate.go
 func main() {
 	// Create a new cli program.
 	p := cli.NewProgram()

server.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/genuinetools/reg/clair"
+	"github.com/genuinetools/reg/internal/binutils"
 	"github.com/gorilla/mux"
 	wordwrap "github.com/mitchellh/go-wordwrap"
 	"github.com/sirupsen/logrus"
@@ -95,7 +96,6 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
 	templateDir := filepath.Join(assetDir, "templates")
 	// Make sure all the paths exist.
 	tmplPaths := []string{
-		staticDir,
 		filepath.Join(templateDir, "vulns.html"),
 		filepath.Join(templateDir, "repositories.html"),
 		filepath.Join(templateDir, "tags.html"),
@@ -132,7 +132,7 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
 		},
 	}
 
-	rc.tmpl = template.Must(template.New("").Funcs(funcMap).ParseGlob(templateDir + "/*.html"))
+	rc.tmpl = template.Must(template.New("").Funcs(funcMap).Parse(templateDir + "/*.html"))
 
 	// Create the initial index.
 	logrus.Info("creating initial static index")
@@ -176,7 +176,7 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
 	}
 
 	// Serve the static assets.
-	staticHandler := http.FileServer(http.Dir(staticDir))
+	staticHandler := http.FileServer(binutils.Assets)
 	mux.PathPrefix("/static/").Handler(http.StripPrefix("/static/", staticHandler))
 	mux.Handle("/", staticHandler)