From dbcdf568188c728d42c1ce3b01864ad6267edf13 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 29 Dec 2023 10:03:37 +1100 Subject: [PATCH] test embed directory --- .drone.yml | 6 +++--- main.go | 6 +++--- {css => www}/mvp.css | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename {css => www}/mvp.css (100%) diff --git a/.drone.yml b/.drone.yml index 37e9d9a..4fc66c2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,8 +14,8 @@ steps: commands: #- pandoc --standalone --output=index.html --metadata title="SMT Readme" -t html5 README.md # From https://gitlab.com/vimalkvn/pandoc-mvp-css - - pandoc -s README.md --toc --toc-depth=2 -c css/mvp.css --template template.html -o index.html - - cp index.html /shared/index.html + - pandoc -s README.md --toc --toc-depth=2 -c www/mvp.css --template template.html -o ./www/index.html -metadata title="SMT Readme" + - cp ./www/index.html /shared/index.html - name: build image: golang @@ -23,7 +23,7 @@ steps: - name: shared path: /shared commands: - - cp /shared/index.html . + - cp /shared/index.html ./www/ - sh ./.drone.sh # Copy binary to test server diff --git a/main.go b/main.go index 975dd6f..f653acf 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,7 @@ type Replacements map[string]string var replacements = make(Replacements) -//go:embed index.htm +//go:embed www var staticContent embed.FS // staticFileServer serves files from the provided fs.FS @@ -40,8 +40,8 @@ func staticFileServer(content embed.FS) gin.HandlerFunc { // Root request should load index.htm if len(fileName) == 1 { - log.Printf("staticFileServer replacing root request with index.htm") - fileName = "index.htm" + log.Printf("staticFileServer replacing root request with index.html") + fileName = "index.html" } //log.Printf("staticFileServer attempting to load filename '%s'\n", fileName) diff --git a/css/mvp.css b/www/mvp.css similarity index 100% rename from css/mvp.css rename to www/mvp.css