Add cache buster for css asset

romanzipp · romanzipp · commit 8876566cbf20 · 2026-02-03T10:38:29.000+01:00
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -48,5 +48,7 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ github.ref_name }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,8 @@ RUN go mod download
 
 COPY . .
 
-RUN CGO_ENABLED=1 GOOS=linux go build -a -ldflags '-linkmode external -extldflags "-static"' -o server .
+ARG VERSION=dev
+RUN CGO_ENABLED=1 GOOS=linux go build -a -ldflags '-linkmode external -extldflags "-static" -X main.Version='${VERSION} -o server .
 
 FROM alpine:latest
 
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
@@ -22,9 +22,10 @@ type Handler struct {
 	db        *database.DB
 	scraper   Scraper
 	templates *template.Template
+	version   string
 }
 
-func New(db *database.DB, scraper Scraper) (*Handler, error) {
+func New(db *database.DB, scraper Scraper, version string) (*Handler, error) {
 	tmpl, err := template.ParseGlob("web/templates/*.html")
 	if err != nil {
 		return nil, err
@@ -34,6 +35,7 @@ func New(db *database.DB, scraper Scraper) (*Handler, error) {
 		db:        db,
 		scraper:   scraper,
 		templates: tmpl,
+		version:   version,
 	}, nil
 }
 
@@ -112,12 +114,14 @@ func (h *Handler) Calendar(w http.ResponseWriter, r *http.Request) {
 		PrevMonth         int
 		NextYear          int
 		NextMonth         int
+		Version           string
 	}{
 		OrganizationID:    orgID,
 		OrganizationTitle: getOrganizationTitle(org),
 		Calendar:          cal,
 		Year:              year,
 		Month:             int(month),
+		Version:           h.version,
 	}
 
 	prevMonth := month - 1
@@ -222,11 +226,13 @@ func (h *Handler) List(w http.ResponseWriter, r *http.Request) {
 		OrganizationTitle string
 		Events            []*database.Event
 		Color             string
+		Version           string
 	}{
 		OrganizationID:    orgID,
 		OrganizationTitle: getOrganizationTitle(org),
 		Events:            events,
 		Color:             color,
+		Version:           h.version,
 	}
 
 	if err := h.templates.ExecuteTemplate(w, "list.html", data); err != nil {
diff --git a/main.go b/main.go
@@ -15,6 +15,8 @@ import (
 	"github.com/romanzipp/linke-calendar/internal/scraper"
 )
 
+var Version = "dev"
+
 func main() {
 	configPath := os.Getenv("CONFIG_PATH")
 	if configPath == "" {
@@ -46,7 +48,7 @@ func main() {
 		log.Fatalf("Failed to start scraper scheduler: %v", err)
 	}
 
-	h, err := handlers.New(db, scheduler.GetScraper())
+	h, err := handlers.New(db, scheduler.GetScraper(), Version)
 	if err != nil {
 		log.Fatalf("Failed to create handlers: %v", err)
 	}
diff --git a/web/templates/calendar.html b/web/templates/calendar.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="noindex">
     <title>{{.OrganizationTitle}} - Kalender</title>
-    <link rel="stylesheet" href="/static/css/style.css?v=0.1.11">
+    <link rel="stylesheet" href="/static/css/style.css{{if ne .Version "dev"}}?v={{.Version}}{{end}}">
     <script src="/static/js/htmx.min.js"></script>
 </head>
 <body class="bg-transparent">
diff --git a/web/templates/list.html b/web/templates/list.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="noindex">
     <title>{{.OrganizationTitle}} - Termine</title>
-    <link rel="stylesheet" href="/static/css/style.css?v=0.1.11">
+    <link rel="stylesheet" href="/static/css/style.css{{if ne .Version "dev"}}?v={{.Version}}{{end}}">
 </head>
 <body class="bg-transparent">
     <div class="w-full mx-auto{{if eq .Color "white"}} text-white{{end}}">

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ import (`
`15`	`15`	`"github.com/romanzipp/linke-calendar/internal/scraper"`
`16`	`16`	`)`
`17`	`17`
	`18`	`+var Version = "dev"`
	`19`	`+`
`18`	`20`	`func main() {`
`19`	`21`	`configPath := os.Getenv("CONFIG_PATH")`
`20`	`22`	`if configPath == "" {`
`@@ -46,7 +48,7 @@ func main() {`
`46`	`48`	`log.Fatalf("Failed to start scraper scheduler: %v", err)`
`47`	`49`	`}`
`48`	`50`
`49`		`- h, err := handlers.New(db, scheduler.GetScraper())`
	`51`	`+ h, err := handlers.New(db, scheduler.GetScraper(), Version)`
`50`	`52`	`if err != nil {`
`51`	`53`	`log.Fatalf("Failed to create handlers: %v", err)`
`52`	`54`	`}`