fix build

37 files changed, 8 insertions, 13 deletions

diff --git a/Dockerfile b/Dockerfile
index 1cacffa..93e7a6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
 FROM xena/go:1.10 AS build
 COPY . /root/go/src/github.com/Xe/site
-RUN GOBIN=/root go build github.com/Xe/site
+RUN CGO_ENABLED=0 GOBIN=/root go install github.com/Xe/site/cmd/site
 
 FROM xena/alpine
 EXPOSE 5000
 RUN apk add --no-cache bash
 COPY --from=build /root/site /site/site
+COPY ./static2 /site/static
 COPY ./templates /site/templates
 COPY ./blog /site/blog
-COPY ./run.sh /site.sh
-COPY ./static /site/static
+COPY ./css /site/css
+COPY ./run.sh /site/run.sh
 
 HEALTHCHECK CMD curl --fail http://127.0.0.1:5000 || exit 1
 CMD /site/run.sh
diff --git a/cmd/site/main.go b/cmd/site/main.go
index e0cc20d..bad297e 100644
--- a/cmd/site/main.go
+++ b/cmd/site/main.go
@@ -12,7 +12,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/GeertJohan/go.rice"
 	"github.com/Xe/jsonfeed"
 	"github.com/Xe/ln"
 	"github.com/gorilla/feeds"
@@ -135,17 +134,12 @@ func Build() (*Site, error) {
 
 	sort.Sort(sort.Reverse(s.Posts))
 
-	cb, err := rice.FindBox("css")
+	resumeData, err := ioutil.ReadFile("./static/resume/resume.md")
 	if err != nil {
 		return nil, err
 	}
 
-	sb, err := rice.FindBox("static")
-	if err != nil {
-		return nil, err
-	}
-
-	s.Resume = template.HTML(blackfriday.Run(sb.MustBytes("resume/resume.md")))
+	s.Resume = template.HTML(blackfriday.Run(resumeData))
 
 	for _, item := range s.Posts {
 		itime, _ := time.Parse("2006-01-02", item.Date)
@@ -174,8 +168,8 @@ func Build() (*Site, error) {
 	s.mux.HandleFunc("/blog.atom", s.createAtom)
 	s.mux.HandleFunc("/blog.json", s.createJsonFeed)
 	s.mux.HandleFunc("/blog/", s.showPost)
-	s.mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(sb.HTTPBox())))
-	s.mux.Handle("/css/", http.StripPrefix("/css/", http.FileServer(cb.HTTPBox())))
+	s.mux.Handle("/css/", http.FileServer(http.Dir(".")))
+	s.mux.Handle("/static/", http.FileServer(http.Dir(".")))
 
 	return s, nil
 }
diff --git a/static/favicon/android-icon-144x144.png b/static2/favicon/android-icon-144x144.png
index 8fc1b9d..8fc1b9d 100644
--- a/static/favicon/android-icon-144x144.png
+++ b/static2/favicon/android-icon-144x144.png
diff --git a/static/favicon/android-icon-192x192.png b/static2/favicon/android-icon-192x192.png
index 6e35ef4..6e35ef4 100644
--- a/static/favicon/android-icon-192x192.png
+++ b/static2/favicon/android-icon-192x192.png
diff --git a/static/favicon/android-icon-36x36.png b/static2/favicon/android-icon-36x36.png
index 9f1ebe7..9f1ebe7 100644
--- a/static/favicon/android-icon-36x36.png
+++ b/static2/favicon/android-icon-36x36.png
diff --git a/static/favicon/android-icon-48x48.png b/static2/favicon/android-icon-48x48.png
index 329092c..329092c 100644
--- a/static/favicon/android-icon-48x48.png
+++ b/static2/favicon/android-icon-48x48.png
diff --git a/static/favicon/android-icon-72x72.png b/static2/favicon/android-icon-72x72.png
index bd1de6c..bd1de6c 100644
--- a/static/favicon/android-icon-72x72.png
+++ b/static2/favicon/android-icon-72x72.png
diff --git a/static/favicon/android-icon-96x96.png b/static2/favicon/android-icon-96x96.png
index 3359b3b..3359b3b 100644
--- a/static/favicon/android-icon-96x96.png
+++ b/static2/favicon/android-icon-96x96.png
diff --git a/static/favicon/apple-icon-114x114.png b/static2/favicon/apple-icon-114x114.png
index 566e9da..566e9da 100644
--- a/static/favicon/apple-icon-114x114.png
+++ b/static2/favicon/apple-icon-114x114.png
diff --git a/static/favicon/apple-icon-120x120.png b/static2/favicon/apple-icon-120x120.png
index b0c9eae..b0c9eae 100644
--- a/static/favicon/apple-icon-120x120.png
+++ b/static2/favicon/apple-icon-120x120.png
diff --git a/static/favicon/apple-icon-144x144.png b/static2/favicon/apple-icon-144x144.png
index 8fc1b9d..8fc1b9d 100644
--- a/static/favicon/apple-icon-144x144.png
+++ b/static2/favicon/apple-icon-144x144.png
diff --git a/static/favicon/apple-icon-152x152.png b/static2/favicon/apple-icon-152x152.png
index b23e114..b23e114 100644
--- a/static/favicon/apple-icon-152x152.png
+++ b/static2/favicon/apple-icon-152x152.png
diff --git a/static/favicon/apple-icon-180x180.png b/static2/favicon/apple-icon-180x180.png
index 0fcd7dd..0fcd7dd 100644
--- a/static/favicon/apple-icon-180x180.png
+++ b/static2/favicon/apple-icon-180x180.png
diff --git a/static/favicon/apple-icon-57x57.png b/static2/favicon/apple-icon-57x57.png
index d73bee6..d73bee6 100644
--- a/static/favicon/apple-icon-57x57.png
+++ b/static2/favicon/apple-icon-57x57.png
diff --git a/static/favicon/apple-icon-60x60.png b/static2/favicon/apple-icon-60x60.png
index 18010ab..18010ab 100644
--- a/static/favicon/apple-icon-60x60.png
+++ b/static2/favicon/apple-icon-60x60.png
diff --git a/static/favicon/apple-icon-72x72.png b/static2/favicon/apple-icon-72x72.png
index bd1de6c..bd1de6c 100644
--- a/static/favicon/apple-icon-72x72.png
+++ b/static2/favicon/apple-icon-72x72.png
diff --git a/static/favicon/apple-icon-76x76.png b/static2/favicon/apple-icon-76x76.png
index 461bbff..461bbff 100644
--- a/static/favicon/apple-icon-76x76.png
+++ b/static2/favicon/apple-icon-76x76.png
diff --git a/static/favicon/apple-icon-precomposed.png b/static2/favicon/apple-icon-precomposed.png
index 43645da..43645da 100644
--- a/static/favicon/apple-icon-precomposed.png
+++ b/static2/favicon/apple-icon-precomposed.png
diff --git a/static/favicon/apple-icon.png b/static2/favicon/apple-icon.png
index 43645da..43645da 100644
--- a/static/favicon/apple-icon.png
+++ b/static2/favicon/apple-icon.png
diff --git a/static/favicon/browserconfig.xml b/static2/favicon/browserconfig.xml
index c554148..c554148 100644
--- a/static/favicon/browserconfig.xml
+++ b/static2/favicon/browserconfig.xml
diff --git a/static/favicon/favicon-16x16.png b/static2/favicon/favicon-16x16.png
index cc8653c..cc8653c 100644
--- a/static/favicon/favicon-16x16.png
+++ b/static2/favicon/favicon-16x16.png
diff --git a/static/favicon/favicon-32x32.png b/static2/favicon/favicon-32x32.png
index 0b705b9..0b705b9 100644
--- a/static/favicon/favicon-32x32.png
+++ b/static2/favicon/favicon-32x32.png
diff --git a/static/favicon/favicon-96x96.png b/static2/favicon/favicon-96x96.png
index 3359b3b..3359b3b 100644
--- a/static/favicon/favicon-96x96.png
+++ b/static2/favicon/favicon-96x96.png
diff --git a/static/favicon/favicon.ico b/static2/favicon/favicon.ico
index 32ed0a3..32ed0a3 100644
--- a/static/favicon/favicon.ico
+++ b/static2/favicon/favicon.ico
diff --git a/static/favicon/manifest.json b/static2/favicon/manifest.json
index 013d4a6..013d4a6 100644
--- a/static/favicon/manifest.json
+++ b/static2/favicon/manifest.json
diff --git a/static/favicon/ms-icon-144x144.png b/static2/favicon/ms-icon-144x144.png
index 8fc1b9d..8fc1b9d 100644
--- a/static/favicon/ms-icon-144x144.png
+++ b/static2/favicon/ms-icon-144x144.png
diff --git a/static/favicon/ms-icon-150x150.png b/static2/favicon/ms-icon-150x150.png
index 3b3e327..3b3e327 100644
--- a/static/favicon/ms-icon-150x150.png
+++ b/static2/favicon/ms-icon-150x150.png
diff --git a/static/favicon/ms-icon-310x310.png b/static2/favicon/ms-icon-310x310.png
index 700d264..700d264 100644
--- a/static/favicon/ms-icon-310x310.png
+++ b/static2/favicon/ms-icon-310x310.png
diff --git a/static/favicon/ms-icon-70x70.png b/static2/favicon/ms-icon-70x70.png
index 7d88c91..7d88c91 100644
--- a/static/favicon/ms-icon-70x70.png
+++ b/static2/favicon/ms-icon-70x70.png
diff --git a/static/geekcode.txt b/static2/geekcode.txt
index f265188..f265188 100644
--- a/static/geekcode.txt
+++ b/static2/geekcode.txt
diff --git a/static/gpg.pub b/static2/gpg.pub
index 6e9be72..6e9be72 100644
--- a/static/gpg.pub
+++ b/static2/gpg.pub
diff --git a/static/img/about/tower.jpg b/static2/img/about/tower.jpg
index 3d9f264..3d9f264 100644
--- a/static/img/about/tower.jpg
+++ b/static2/img/about/tower.jpg
diff --git a/static/img/avatar.png b/static2/img/avatar.png
index ae84a1f..ae84a1f 100644
--- a/static/img/avatar.png
+++ b/static2/img/avatar.png
diff --git a/static/img/lokahi.dot b/static2/img/lokahi.dot
index 8bd9385..8bd9385 100644
--- a/static/img/lokahi.dot
+++ b/static2/img/lokahi.dot
diff --git a/static/img/lokahi.png b/static2/img/lokahi.png
index e1aa6dd..e1aa6dd 100644
--- a/static/img/lokahi.png
+++ b/static2/img/lokahi.png
diff --git a/static/keybase.txt b/static2/keybase.txt
index 90d3c61..90d3c61 100644
--- a/static/keybase.txt
+++ b/static2/keybase.txt
diff --git a/static/resume/resume.md b/static2/resume/resume.md
index 23e90a9..23e90a9 100644
--- a/static/resume/resume.md
+++ b/static2/resume/resume.md