Serve assets from binary.

Author: tristanmorgan

.circleci/config.yml

@@ -28,6 +28,7 @@ jobs:
           name: Setup
           command: |
             go get -v -t -d ./...
+            go get github.com/GeertJohan/go.rice/rice
             mkdir output
             go build -ldflags="-s -w" -a -v -o TechChallengeApp .
             ls
@@ -47,9 +48,12 @@ jobs:
             mkdir -p dist
             
             go build -ldflags="-s -w" -a -v -o TechChallengeApp .
-            
+
+            pushd ui
+            rice append --exec ../TechChallengeApp
+            popd
+
             cp TechChallengeApp dist/
-            cp -r assets dist/
             cp conf.toml dist/
             
             rm TechChallengeApp
@@ -72,11 +76,14 @@ jobs:
             mkdir -p dist
             
             go build -ldflags="-s -w" -a -v -o TechChallengeApp .
-            
+
+            pushd ui
+            rice append --exec ../TechChallengeApp
+            popd
+
             cp TechChallengeApp dist/
-            cp -r assets dist/
             cp conf.toml dist/
-            
+
             rm TechChallengeApp
 
             export version=$(cat versionfile)
@@ -101,11 +108,14 @@ jobs:
             mkdir -p dist
             
             go build -ldflags="-s -w" -a -v -o TechChallengeApp.exe .
-            
+
+            pushd ui
+            rice append --exec ../TechChallengeApp.exe
+            popd
+
             cp TechChallengeApp.exe dist/
-            cp -r assets dist/
             cp conf.toml dist/
-            
+
             rm TechChallengeApp.exe
 
             export version=$(cat versionfile)
@@ -126,11 +136,14 @@ jobs:
             mkdir -p dist
             
             go build -ldflags="-s -w" -a -v -o TechChallengeApp.exe .
-            
+
+            pushd ui
+            rice append --exec ../TechChallengeApp.exe
+            popd
+
             cp TechChallengeApp.exe dist/
-            cp -r assets dist/
             cp conf.toml dist/
-            
+
             rm TechChallengeApp.exe
 
             export version=$(cat versionfile)

Dockerfile

@@ -12,6 +12,8 @@ RUN dir=$(mktemp -d) \
     && mv /tmp/swagger-ui-$SWAGGER_UI_VERSION /tmp/swagger \
     && sed -i 's#"https://petstore\.swagger\.io/v2/swagger\.json"#"./swagger.json"#g' /tmp/swagger/dist/index.html
 
+RUN go get github.com/GeertJohan/go.rice/rice
+
 WORKDIR $GOPATH/src/github.com/servian/TechChallengeApp
 
 COPY go.mod go.sum $GOPATH/src/github.com/servian/TechChallengeApp/
@@ -20,18 +22,18 @@ RUN go mod tidy
 
 COPY . .
 
-RUN go build -ldflags="-s -w" -a -o /TechChallengeApp
-RUN swagger generate spec -o /swagger.json
+RUN CGO_ENABLED="0" go build -ldflags="-s -w" -a -o /TechChallengeApp
+RUN swagger generate spec -o /swagger.json \
+ && cp /swagger.json ui/assets/swagger/ \
+ && cp -R /tmp/swagger/dist ui/assets/swagger
+
+RUN cd ui && rice append --exec /TechChallengeApp
 
 FROM alpine:latest
 
 WORKDIR /TechChallengeApp
 
-COPY assets ./assets
 COPY conf.toml ./conf.toml
-
-COPY --from=build /tmp/swagger/dist ./assets/swagger
-COPY --from=build /swagger.json ./assets/swagger/swagger.json
 COPY --from=build /TechChallengeApp TechChallengeApp
 
 ENTRYPOINT [ "./TechChallengeApp" ]

build.sh

@@ -8,10 +8,13 @@ mkdir -p dist
 
 go mod tidy
 
-go build -ldflags="-s -w" -a -v -o TechChallengeApp .
+CGO_ENABLED="0" go build -ldflags="-s -w" -a -v -o TechChallengeApp .
+
+pushd ui
+rice append --exec TechChallengeApp
+popd
 
 cp TechChallengeApp dist/
-cp -r assets dist/
 cp conf.toml dist/
 
 rm TechChallengeApp

go.mod

@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/GeertJohan/go.rice v1.0.2
 	github.com/fsnotify/fsnotify v1.4.7 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.6.2

go.sum

@@ -1,5 +1,11 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
+github.com/GeertJohan/go.rice v1.0.2 h1:PtRw+Tg3oa3HYwiDBZyvOJ8LdIyf6lAovJJtr7YOAYk=
+github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4=
+github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/daaku/go.zipexe v1.0.0 h1:VSOgZtH418pH9L16hC/JrgSNJbbAL26pj7lmD1+CGdY=
+github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -13,12 +19,14 @@ github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce h1:xdsDDbiBDQTKASoGE
 github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2 h1:hRGSmZu7j271trc9sneMrpOW7GN5ngLm8YUZIPzf394=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 h1:KXZJFdun9knAVAR8tg/aHJEr5DgtcbqyvzacK+CDCaI=
 github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -38,6 +46,8 @@ github.com/spf13/viper v1.0.2/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7Sr
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8 h1:7T3bTJEttnfJdEY+NY/VYT7IXRaul8potWiyw/n7LB8=
 golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=

assets/css/site.css renamed to ui/assets/css/site.css

@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/GeertJohan/go.rice"
 	"github.com/gorilla/mux"
 )
 
@@ -68,15 +69,12 @@ func indexHandler() http.Handler {
 	})
 }
 
-func assetHandler(cfg Config) http.Handler {
-	// so not secure!
-	return http.FileServer(cfg.Assets)
-}
-
 func uiHandler(cfg Config, router *mux.Router) {
-	router.PathPrefix("/js/").Handler(assetHandler(cfg))
-	router.PathPrefix("/css/").Handler(assetHandler(cfg))
-	router.PathPrefix("/images/").Handler(assetHandler(cfg))
-	router.PathPrefix("/swagger/").Handler(assetHandler(cfg))
+	box := rice.MustFindBox("assets")
+	staticFileServer := http.FileServer(box.HTTPBox())
+	router.Handle("/js/{path:.*}", staticFileServer)
+	router.Handle("/css/{path:.*}", staticFileServer)
+	router.Handle("/images/{path:.*}", staticFileServer)
+	router.Handle("/swagger/{path:.*}", staticFileServer)
 	router.Handle("/", indexHandler())
 }