Compile images ahead of time.

Author: qbarrand

.github/dependabot.yml

@@ -13,4 +13,9 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/ci.yml

@@ -3,9 +3,8 @@ name: CI
 on: pull_request
 
 jobs:
-  build:
-    name: Build and test
-
+  test-go:
+    name: Build and test Go code
     runs-on: ubuntu-latest
 
     steps:
@@ -18,8 +17,51 @@ jobs:
       - name: Install dependencies
         run: docker exec ci apk add gcc git imagemagick-dev make musl-dev pkgconfig vips-dev
 
+      - name: Mark the directory as safe when mounted into the container
+        run: docker exec ci git config --global --add safe.directory /usr/src/app
+
       - name: Build
-        run: docker exec -w /usr/src/app ci make
+        run: docker exec -w /usr/src/app ci make server img-out
+
+      - name: Build with ImageMagick7 support
+        run: docker exec -w /usr/src/app ci make image-resizer GOTAGS='-tags magick'
 
       - name: Run tests
         run: docker exec -w /usr/src/app ci go test ./...
+
+  lint-go:
+    runs-on: ubuntu-latest
+    name: Lint Go Code
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Start the CI container
+        run: docker run -d --name ci -v $PWD:/app golangci/golangci-lint:latest-alpine sleep infinity
+
+      - name: Install dependencies
+        run: docker exec ci apk add gcc imagemagick-dev musl-dev pkgconfig vips-dev
+
+      - name: golangci-lint
+        run: docker exec -w /app ci golangci-lint run -v --timeout 3m --build-tags magick --out-format=github-actions
+
+#  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

@@ -4,5 +4,11 @@
 # IDE
 .idea/
 
-# compiled binary
-quba-fr
+# built files
+image-resizer
+server
+dist/
+img-out
+
+# Node stuff
+node_modules

Dockerfile

@@ -1,21 +1,50 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.18-alpine as go-builder
 
 RUN ["apk", "add", "gcc", "git", "imagemagick-dev", "make", "musl-dev", "pkgconfig", "vips-dev"]
 
 WORKDIR /usr/src/app
 
-COPY . .
+RUN ["mkdir", "/web-src"]
 
-RUN ["make"]
+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/
 
-FROM alpine
+RUN ["make", "server", "img-out"]
+
+FROM node:17-alpine as node-builder
+
+RUN ["apk", "add", "make"]
+
+RUN ["mkdir", "/build"]
+WORKDIR /build
 
-COPY --from=builder /usr/src/app/quba-fr /quba-fr
+RUN ["mkdir", "dist"]
+
+COPY config/ config/
+COPY Makefile .
+COPY package.json .
+COPY package-lock.json .
+COPY tsconfig.json .
+COPY webpack.config.js .
+COPY web-src/ web-src/
+
+RUN ["npm", "install", "."]
+RUN ["make", "webapp"]
+
+FROM alpine
 
-RUN ["apk", "add", "--no-cache", "imagemagick", "vips"]
+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
 
 EXPOSE 8080/tcp
 
 LABEL org.opencontainers.image.source https://github.com/qbarrand/quba.fr
 
-ENTRYPOINT ["/quba-fr"]
+ENTRYPOINT ["/server", "-img-out-dir", "img-out", "-webroot-dir", "dist"]

Makefile

@@ -1,7 +1,19 @@
-all: quba-fr
+all: img-out server webapp
 
-quba-fr: $(shell find . -type f -name '*.go') go.mod go.sum
-	go build -o $@
+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 -processor vips
+
+webapp:
+	npx webpack --mode production
+
+server: $(shell find . -name '*.go' -type f) go.mod go.sum
+	go build -o $@ $(GOTAGS) ./cmd/server
 
 clean:
-	rm quba-fr
+	rm -fr img-out
+	rm -f aot-images
+	rm -f server

cmd/image-resizer/imagick.go

@@ -0,0 +1,9 @@
+// +build magick
+
+package main
+
+import "github.com/qbarrand/quba.fr/internal/imgpro"
+
+func init() {
+	processorMap["magick"] = &imgpro.ImageMagickProcessor{}
+}