Make the background images move (#339)

* Make the backgrounds move

Remove the server app.
Improve the image generator.

* Enable asset compression

* Switch back to JavaScript

Limit to 3 images on potentially metered connections.

Author: qbarrand

.github/workflows/ci.yml

@@ -10,16 +10,13 @@ jobs:
 
     steps:
       - name: Install dependencies
-        run: apk add gcc imagemagick-dev make musl-dev pkgconfig vips-dev
+        run: apk add gcc imagemagick-dev make musl-dev pkgconfig
 
       - name: Check out the repo
         uses: actions/checkout@v4
 
       - name: Build
-        run: make server img-out
-
-      - name: Build
-        run: make image-resizer
+        run: make imgen
 
       - name: Run tests
         run: go test ./...
@@ -31,7 +28,7 @@ jobs:
 
     steps:
       - name: Install dependencies
-        run: apk add gcc imagemagick-dev musl-dev pkgconfig tar vips-dev
+        run: apk add gcc imagemagick-dev musl-dev pkgconfig tar
 
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -43,23 +40,3 @@ jobs:
         uses: golangci/golangci-lint-action@v7
         with:
           install-mode: none
-
-#  test-js:
-#    name: Build and test Javascript code
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#      - name: Check out code into the Go module directory
-#        uses: actions/checkout@v2
-#
-#      - uses: actions/setup-node@v2
-#        with:
-#          node-version: '17'
-#          cache: 'npm'
-#
-#      - run: npm install
-#
-#      - run: npm test
-#
-#      - name: Build the webapp
-#        run: make webapp

.gitignore

@@ -5,10 +5,9 @@
 .idea/
 
 # built files
-image-resizer
-server
+imgen
 dist/
-img-out
+backgrounds/
 
 # Node stuff
 node_modules

Dockerfile

@@ -2,17 +2,14 @@ FROM golang:1.24.2-alpine as go-builder
 
 WORKDIR /usr/src/app
 
+COPY backgrounds.mk .
 COPY cmd/ cmd/
-COPY config/ config/
 COPY img-src/ img-src/
-COPY internal/ internal/
-COPY Makefile Makefile
-COPY go.mod go.mod
-COPY go.sum go.sum
-COPY pkg/ pkg/
+COPY go.mod .
+COPY go.sum .
 
-RUN ["apk", "add", "gcc", "git", "imagemagick-dev", "make", "musl-dev", "pkgconfig", "vips-dev"]
-RUN ["make", "server", "img-out"]
+RUN ["apk", "add", "gcc", "imagemagick-dev", "imagemagick-heic", "imagemagick-jpeg", "imagemagick-webp", "make", "musl-dev"]
+RUN ["make", "-f", "backgrounds.mk", "backgrounds/backgrounds.json"]
 
 FROM python:3 as python-builder
 
@@ -23,34 +20,23 @@ RUN ["make", "-C", "fa-src"]
 
 FROM node:23-alpine as node-builder
 
-RUN ["mkdir", "/build"]
+COPY --from=go-builder /usr/src/app /build
 WORKDIR /build
 
-COPY config/ config/
-COPY fa-src/ fa-src/
+COPY fa-src fa-src
 COPY Makefile .
 COPY package.json .
 COPY package-lock.json .
-COPY tsconfig.json .
+COPY web-src web-src
 COPY webpack.config.js .
-COPY web-src/ web-src/
-
-RUN ["mkdir", "dist"]
 
 COPY --from=python-builder /fa-src/fa-brands.woff2 fa-src/
 COPY --from=python-builder /fa-src/fa-solid.woff2 fa-src/
 
 RUN ["npm", "install", "."]
-
 RUN ["apk", "add", "make"]
-RUN ["make", "webapp"]
-
-FROM alpine
-
-COPY --from=go-builder /usr/src/app/server /server
-COPY --from=go-builder /usr/src/app/img-out /img-out
-COPY --from=node-builder /build/dist /dist
+RUN ["make"]
 
-EXPOSE 8080/tcp
+FROM scratch
 
-ENTRYPOINT ["/server", "-img-out-dir", "img-out", "-webroot-dir", "dist"]
+COPY --from=node-builder /build/dist /

Makefile

@@ -1,23 +1,16 @@
-all: img-out server webapp
+FONTS := $(addprefix web-src/webfonts/,fa-brands.woff2 fa-solid.woff2)
 
-image-resizer: $(shell find . -name '*.go' -type f) go.mod go.sum
-	go build -o $@ $(GOTAGS) ./cmd/image-resizer
-
-img-out: image-resizer $(wildcard img-src/*)
-	mkdir -p $@
-	./$< -img-out-dir $@ -img-in-dir img-src
+all: $(FONTS) backgrounds/backgrounds.json
+	mkdir -p dist
+	npx webpack --mode production
+	cp -r backgrounds dist/backgrounds
 
-fontawesome-subsets:
+$(FONTS):
 	make -C fa-src
 	mv fa-src/fa-brands.woff2 fa-src/fa-solid.woff2 web-src/webfonts/
 
-webapp: fontawesome-subsets
-	npx webpack --mode production
-
-server: $(shell find . -name '*.go' -type f) go.mod go.sum
-	go build -ldflags="-X main.version=$(shell cat VERSION)" -o $@ $(GOTAGS) ./cmd/server
-
+.PHONY: clean
 clean:
-	rm -fr img-out
-	rm -f aot-images
-	rm -f server
+	rm -fr imgen img-out
+
+include backgrounds.mk

VERSION

@@ -1 +1 @@
-4.1.0
+5.0.0

backgrounds.mk

@@ -0,0 +1,8 @@
+imgen: $(shell find . -name '*.go' -type f) go.mod go.sum
+	go build -o $@ ./cmd/imgen
+
+BACKGROUNDS_DIR := backgrounds
+
+$(BACKGROUNDS_DIR)/backgrounds.json: imgen
+	mkdir -p $(BACKGROUNDS_DIR)
+	./$< -out-dir $(BACKGROUNDS_DIR) -in-dir img-src