mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-21 21:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Uses Go1.16 embed feature (#1092)

Browse Source 
* Uses Go1.16 embed feature

* Fixes tests

* Removes packr and fixes tests
This commit is contained in:
Amir Raminfar
2021-03-21 18:38:17 -07:00
committed by GitHub
parent 34259c4cb5
commit e2934e8179
9 changed files with 109 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
web/routes.go
View File

@@ -4,10 +4,13 @@ import (
"bufio"
"compress/gzip"
"context"
"encoding/json"
"fmt"
"html/template"
"io"
"io/fs"
"io/ioutil"
"net/http"
_ "net/http/pprof"
"runtime"
@@ -17,7 +20,7 @@ import (
"github.com/amir20/dozzle/docker"
"github.com/dustin/go-humanize"
"github.com/gobuffalo/packr"
"github.com/gorilla/mux"
log "github.com/sirupsen/logrus"
)
@@ -31,17 +34,18 @@ type Config struct {
}
type handler struct {
client docker.Client
box packr.Box
config *Config
client docker.Client
content fs.FS
config *Config
fileServer http.Handler
}
// CreateServer creates a service for http handler
func CreateServer(c docker.Client, b packr.Box, config Config) *http.Server {
func CreateServer(c docker.Client, content fs.FS, config Config) *http.Server {
handler := &handler{
client: c,
box: b,
config: &config,
client: c,
content: content,
config: &config,
}
return &http.Server{Addr: config.Addr, Handler: createRouter(handler)}
}
@@ -66,7 +70,13 @@ func createRouter(h *handler) *mux.Router {
s.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
}
s.PathPrefix("/").Handler(http.StripPrefix(base, http.HandlerFunc(h.index)))
if base != "/" {
s.PathPrefix("/").Handler(http.StripPrefix(base+"/", http.HandlerFunc(h.index)))
} else {
s.PathPrefix("/").Handler(http.StripPrefix(base, http.HandlerFunc(h.index)))
}
h.fileServer = http.FileServer(http.FS(h.content))
return r
}
@@ -79,15 +89,19 @@ func setCSPHeaders(next http.Handler) http.Handler {
}
func (h *handler) index(w http.ResponseWriter, req *http.Request) {
fileServer := http.FileServer(h.box)
if h.box.Has(req.URL.Path) && req.URL.Path != "" && req.URL.Path != "/" {
fileServer.ServeHTTP(w, req)
_, err := h.content.Open(req.URL.Path)
if err == nil && req.URL.Path != "" && req.URL.Path != "/" {
h.fileServer.ServeHTTP(w, req)
} else {
text, err := h.box.FindString("index.html")
file, err := h.content.Open("index.html")
if err != nil {
panic(err)
}
tmpl, err := template.New("index.html").Parse(text)
bytes, err := ioutil.ReadAll(file)
if err != nil {
panic(err)
}
tmpl, err := template.New("index.html").Parse(string(bytes))
if err != nil {
panic(err)
}