Added node stage to build assets

.dockerignore

@@ -1,12 +1,14 @@
+/kubico
 /.git
 /.vscode
-/assets
-!/assets/dist
-/.dockerignore
-/.editorconfig
-/.env
-/.gitignore
-/kubico
-/README.md
-/Taskfile.yml
-/.hadolint.yml
+/.github
+/dist
+/assets/node_modules
+.dockerignore
+.editorconfig
+.env
+.gitignore
+README.md
+Taskfile.dist.yml
+Taskfile.yml
+.hadolint.yml

.gitignore

@@ -1,2 +1,3 @@
 /.task
 /kubico
+/dist

Dockerfile

@@ -1,3 +1,16 @@
+FROM node:18.18.0-bullseye AS node
+
+WORKDIR /src/assets
+
+COPY ./assets/package*.json .
+
+RUN npm ci
+
+COPY ./assets .
+COPY ./templates ../templates
+
+RUN npm run prod
+
 FROM golang:1.21.2-bookworm AS builder
 
 WORKDIR /src
@@ -13,6 +26,8 @@ RUN go mod download
 
 COPY . .
 
+COPY --from=node /src/dist dist
+
 ARG GOARCH=amd64
 
 RUN go generate \

Taskfile.yml

@@ -98,8 +98,7 @@ tasks:
         --tty
         --env npm_config_cache=/tmp/npmcache
         --user $(id -u):$(id -g)
-        --volume $(pwd)/assets:/src/assets
-        --volume $(pwd)/templates:/src/templates
+        --volume $(pwd):/src
         --workdir /src/assets
         node:{{.NODE_TAG_VERSION}} {{.RUN_CMD}}
 

assets/package.json

@@ -1,7 +1,7 @@
 {
   "scripts": {
-    "dev": "NODE_ENV=development postcss src/tailwind.css -o dist/tailwind.css",
-    "prod": "NODE_ENV=production postcss src/tailwind.css -o dist/tailwind.css"
+    "dev": "NODE_ENV=development postcss src/tailwind.css -o ../dist/tailwind.css",
+    "prod": "NODE_ENV=production postcss src/tailwind.css -o ../dist/tailwind.css"
   },
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^5.0.0",

routes.go

@@ -6,14 +6,14 @@ import (
 	"net/http"
 )
 
-//go:embed assets/dist/*
+//go:embed dist/*
 var assets embed.FS
 
 func (app *application) routes() *http.ServeMux {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", app.maxRequests(app.home))
 
-	assetsFS, err := fs.Sub(assets, "assets/dist")
+	assetsFS, err := fs.Sub(assets, "dist")
 	if err != nil {
 		app.errorLog.Println(err.Error())
 	}