fix static file access in docker
1 file changed, 5 insertions(+), 13 deletions(-)
changed files
M internal/builder/template.go → internal/builder/template.go
@@ -4,13 +4,13 @@ import ( "bytes" "encoding/xml" "io" - "os" "strings" "text/template" "go.alanpearce.eu/website/internal/atom" "go.alanpearce.eu/website/internal/config" "go.alanpearce.eu/website/internal/content" + "go.alanpearce.eu/website/templates" "github.com/PuerkitoBio/goquery" "github.com/antchfx/xmlquery"@@ -19,7 +19,6 @@ "gitlab.com/tozd/go/errors" ) var ( - css string nsMap = map[string]string{ "xsl": "http://www.w3.org/1999/XSL/Transform", "atom": "http://www.w3.org/2005/Atom",@@ -27,14 +26,6 @@ "xhtml": "http://www.w3.org/1999/xhtml", } ) -func loadCSS() { - bytes, err := os.ReadFile("templates/style.css") - if err != nil { - panic(err) - } - css = string(bytes) -} - type QuerySelection struct { *goquery.Selection }@@ -55,7 +46,7 @@ } func renderRobotsTXT(config *config.Config) (io.Reader, error) { r, w := io.Pipe() - tpl, err := template.ParseFiles("templates/robots.tmpl") + tpl, err := template.ParseFS(templates.Files, "robots.tmpl") if err != nil { return nil, err }@@ -118,13 +109,14 @@ return buf, nil } func renderFeedStyles() (*strings.Reader, error) { - tpl, err := template.ParseFiles("templates/feed-styles.xsl") + tpl, err := template.ParseFS(templates.Files, "feed-styles.xsl") if err != nil { return nil, err } esc := &strings.Builder{} - err = xml.EscapeText(esc, []byte(css)) + err = xml.EscapeText(esc, []byte(templates.CSS)) + if err != nil { return nil, err }