try a fix from actions/setup-node#488 (comment)

muehlemann-popp · Nov 9, 2022 · be64557 · be64557
1 parent 6538486
commit be64557
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,19 +17,35 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
-          cache: 'yarn'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+        shell: bash
+        working-directory: tooling
+
+      - name: Restore yarn cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+          restore-keys: |
+            yarn-cache-folder-
+
       # https://github.com/docker/buildx/issues/495#issuecomment-1043341496
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v2
         with:
           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
@@ -40,11 +56,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:

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -19,8 +19,7 @@ RUN \
   && apk add --no-cache \
     tini make gcc g++ python3 git nodejs npm yarn \
   && mkdir -p /app/build \
-  && addgroup -g 1000 chrome  \
-  && adduser -u 1000 -G chrome -D chrome \
+  && adduser -D chrome \
   && chown -R chrome:chrome /app
 
 WORKDIR /app

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "express": "^4.17.1",
     "marked": "^2.1.2",
     "prom-client": "^13.1.0",
-    "puppeteer": "^18.1.0"
+    "puppeteer": "18.1.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.12",

diff --git a/yarn.lock b/yarn.lock
@@ -3910,7 +3910,7 @@ __metadata:
     npm-run-all: ^4.1.5
     prettier: ^2.3.1
     prom-client: ^13.1.0
-    puppeteer: ^18.1.0
+    puppeteer: 18.1.0
     supertest: ^6.1.3
     terser-webpack-plugin: ^5.1.3
     ts-jest: ^27.0.3
@@ -6067,33 +6067,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"puppeteer-core@npm:18.2.1":
-  version: 18.2.1
-  resolution: "puppeteer-core@npm:18.2.1"
+"puppeteer@npm:18.1.0":
+  version: 18.1.0
+  resolution: "puppeteer@npm:18.1.0"
   dependencies:
     cross-fetch: 3.1.5
     debug: 4.3.4
     devtools-protocol: 0.0.1045489
     extract-zip: 2.0.1
     https-proxy-agent: 5.0.1
+    progress: 2.0.3
     proxy-from-env: 1.1.0
     rimraf: 3.0.2
     tar-fs: 2.1.1
     unbzip2-stream: 1.4.3
     ws: 8.9.0
-  checksum: 27ed65a7335ee3f4356425ebe4bbb5202f7b39493398643554a12b981922b2243dc331d9a478215706b79696bcf391637dd5e5405d60aff6ba8f94f0c3fea742
-  languageName: node
-  linkType: hard
-
-"puppeteer@npm:^18.1.0":
-  version: 18.2.1
-  resolution: "puppeteer@npm:18.2.1"
-  dependencies:
-    https-proxy-agent: 5.0.1
-    progress: 2.0.3
-    proxy-from-env: 1.1.0
-    puppeteer-core: 18.2.1
-  checksum: 58ba8c7abd82071dc12e280622fa352a8ac253375a514c7a3527b468672a4ccdfe20b37aa09498774da2f0666bcdd9a47838c6661de483a3d6e10b47ef666113
+  checksum: b805067a1cb5d33afeb5359b268c2d2f8915ee066f653622a045b4fc9a14e5fbfb13894d67903183d023e87e2f8302d78d3fcc75d9ad2973fb8e49daf3261402
   languageName: node
   linkType: hard