fix: buildx bake file spec

.github/workflows/default.yml

@@ -7,15 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TAG: html-to-pdf
+      PUPPETEER_SKIP_DOWNLOAD: 1
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: 'yarn'
-      - run: yarn install
-      - run: yarn lint --max-warnings 0
       - name: Build container
         run: docker build --file deploy/Dockerfile --target test --tag ${TAG} .
+      - name: Run lint in a container
+        run: docker run --rm ${TAG} yarn lint --max-warnings 0
       - name: Run test in a container
         run: docker run --rm ${TAG} yarn test

.github/workflows/release.yml

@@ -12,13 +12,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+
+      # https://github.com/docker/buildx/issues/495#issuecomment-1043341496
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v2
         with:
-          node-version: '16'
-          cache: 'yarn'
+          image: tonistiigi/binfmt:qemu-v6.2.0
+          platforms: amd64,arm64
+
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          platforms: amd64,arm64
+
       - name: Define docker image metadata
         uses: docker/metadata-action@v4
         id: meta
@@ -29,11 +37,13 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha,prefix=git-,format=short
+
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push
         uses: docker/bake-action@v2
         with:

.npmversion

@@ -1 +1 @@
-7.10.0
+8.11.0

.nvmrc

@@ -1 +1 @@
-v15.11.0
+v16.16.0

Taskfile.yml

@@ -12,6 +12,9 @@ vars:
     nvm use;
   COMPOSE: docker-compose --file deploy/docker-compose.yml
 
+env:
+  PUPPETEER_SKIP_DOWNLOAD: 1
+
 tasks:
   default: task --list
 

deploy/Dockerfile

@@ -1,28 +1,15 @@
-FROM node:16-alpine as builder
-
-WORKDIR /app
-COPY . /app
-
-RUN yarn install && yarn build
-
-
-FROM alpine:3.16 as prod
-
 ARG RELEASE_ID
 ARG CI_BUILD_DATE
+ARG CHROME_BIN=/usr/bin/chromium-browser
+ARG CHROME_PATH=/usr/lib/chromium/
+ARG PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
-ENV \
-  CHROME_BIN=/usr/bin/chromium-browser \
-  CHROME_PATH=/usr/lib/chromium/ \
-  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 \
-  PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser \
-  RELEASE_ID=$RELEASE_ID \
-  CI_BUILD_DATE=$CI_BUILD_DATE
+FROM alpine:3.16 as base
 
 # Installs latest Chromium package.
 RUN \
   apk upgrade --no-cache --available \
-  && apk add --no-cache \
+  && apk add --no-cache  \
     chromium \
     ttf-freefont \
     font-noto-emoji \
@@ -37,6 +24,28 @@ RUN \
 
 WORKDIR /app
 
+
+FROM base as builder
+
+ENV \
+  CHROME_BIN=$CHROME_BIN \
+  CHROME_PATH=$CHROME_PATH \
+  PUPPETEER_SKIP_DOWNLOAD=1 \
+  PUPPETEER_EXECUTABLE_PATH=$PUPPETEER_EXECUTABLE_PATH
+
+COPY . /app
+
+RUN yarn install && yarn build
+
+
+FROM base as prod
+
+ENV \
+  CHROME_BIN=$CHROME_BIN \
+  CHROME_PATH=$CHROME_PATH \
+  RELEASE_ID=$RELEASE_ID \
+  CI_BUILD_DATE=$CI_BUILD_DATE
+
 COPY deploy/local.conf /etc/fonts/local.conf
 COPY --from=builder /app/build/main.prod.js .
 COPY favicon.ico .
@@ -54,24 +63,36 @@ CMD ["/docker-entrypoint.sh"]
 
 FROM prod as dev
 
+ENV \
+  CHROME_BIN=$CHROME_BIN \
+  CHROME_PATH=$CHROME_PATH \
+  RELEASE_ID=$RELEASE_ID \
+  CI_BUILD_DATE=$CI_BUILD_DATE
+
 # change user to bypass write limitations
 USER root
 
 COPY . /app
 
 RUN chown -R chrome ./
 
-# change user back to one used by zenika image
+# change user back to default
 USER chrome
 
 RUN yarn install
 
 
 FROM prod as test
 
+ENV \
+  CHROME_BIN=$CHROME_BIN \
+  CHROME_PATH=$CHROME_PATH \
+  RELEASE_ID=$RELEASE_ID \
+  CI_BUILD_DATE=$CI_BUILD_DATE
+
 # change user to bypass write limitations
 USER root
 
 COPY . /app
 
-RUN yarn
+RUN yarn install

docker-bake.hcl

@@ -3,9 +3,9 @@ target "docker-metadata-action" {}
 target "build" {
   inherits = ["docker-metadata-action"]
   context = "./"
-  dockerfile = "deploy/prod/Dockerfile"
+  dockerfile = "deploy/Dockerfile"
+  target = "prod"
   platforms = [
-    "linux/386",
     "linux/amd64",
     "linux/arm64/v8",
   ]

package.json

@@ -23,13 +23,12 @@
     "express": "^4.17.1",
     "marked": "^2.1.2",
     "prom-client": "^13.1.0",
-    "puppeteer": "^10.4.0"
+    "puppeteer": "18.1.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.12",
     "@types/jest": "^26.0.23",
     "@types/node": "^15.12.4",
-    "@types/puppeteer": "^5.4.4",
     "@types/supertest": "^2.0.11",
     "@types/terser-webpack-plugin": "^5.0.3",
     "@types/webpack": "^5.28.0",
@@ -58,6 +57,6 @@
     "webpack-cli": "^4.7.2"
   },
   "engines": {
-    "node": "~15"
+    "node": "~16"
   }
 }