Process templates with Webpack

Allows us to embed the content checksum in the asset URLs, to
avoid caching issues. We also add SRI while we're at it.

.dockerignore

+Dockerfile
+assets
 build
 node_modules
+package-lock.json
 .git

.gitignore

@@ -11,3 +11,5 @@ data.json
 test-httpd.pid
 test-httpd.log
 node_modules
+assets
+package-lock.json

Dockerfile

-FROM node:current-buster AS assets
+FROM node:current-bullseye AS assets
 ADD . /src
 WORKDIR /src
-RUN npm install && ./node_modules/.bin/webpack
+RUN npm install && env NODE_OPTIONS=--openssl-legacy-provider ./node_modules/.bin/webpack
 
 # Debian bullseye can't build gostatic due to its strict dependency
-# on Go 1.16, so we build it separately.
-FROM golang:1.16 AS gobuild
+# on Go 1.17, so we build it separately.
+FROM golang:1.17 AS gobuild
 RUN go get github.com/piranha/gostatic
 RUN go get git.autistici.org/ai/webtools/cmd/sitesearch
 RUN go get git.autistici.org/ai/webtools/cmd/jsonsubst
 
-FROM debian:bullseye AS build
+FROM debian:bullseye-slim AS build
 RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends rsync
 ADD . /src
 WORKDIR /src
 COPY --from=gobuild /go/bin/gostatic /usr/bin/gostatic
 COPY --from=gobuild /go/bin/sitesearch /usr/bin/sitesearch
 COPY --from=gobuild /go/bin/jsonsubst /usr/bin/jsonsubst
+COPY --from=assets /src/assets/templates/ /src/assets/templates/
 RUN ./scripts/lint.sh && ./scripts/update.sh
 
 FROM registry.git.autistici.org/ai3/docker/apache2-base:s6
 COPY --from=build /src/public /var/www/autistici.org
 COPY --from=gobuild /go/bin/sitesearch /usr/sbin/sitesearch
 COPY --from=build /src/index /var/lib/sitesearch/index
-COPY --from=assets /src/static/ /var/www/autistici.org/static/
-COPY templates /var/lib/sitesearch/templates
+COPY --from=assets /src/assets/static/ /var/www/autistici.org/static/
+COPY --from=assets /src/assets/templates/ /var/lib/sitesearch/templates/
+COPY static/ /var/www/autistici.org/static/
 COPY docker/conf/ /etc/
 COPY docker/build.sh /tmp/build.sh
 

config

-TEMPLATES = templates
+TEMPLATES = assets/templates
 SOURCE = src
 OUTPUT = public
 

package.json

@@ -7,11 +7,13 @@
     "css-loader": "6.4.0",
     "extract-loader": "5.1.0",
     "glob": "7.2.0",
+    "html-webpack-plugin": "5.5.0",
     "jquery": "3.6.0",
     "mini-css-extract-plugin": "2.4.3",
     "open-iconic": "1.1.1",
     "purgecss-webpack-plugin": "4.0.3",
     "webpack": "latest",
-    "webpack-cli": "latest"
+    "webpack-cli": "latest",
+    "webpack-subresource-integrity": "5.0.0"
   }
 }

static/.gitignore

-ai.css
-ai.js*
-*.eot
-*.otf
-*.ttf
-*.svg
-*.woff