From a83496947857a0eb863de75ec332f0313a629c2e Mon Sep 17 00:00:00 2001
From: tippfehlr <tippfehlr@tippfehlr.eu>
Date: Fri, 26 Apr 2024 22:47:23 +0200
Subject: [PATCH] build: update Dockerfile, endeveit/docker-jq is not available
 anymore

---
 Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d238fba..153e995 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,10 @@
-# https://stackoverflow.com/a/58487433
-# To prevent cache invalidation from changes in fields other than dependencies
-
-FROM --platform=$BUILDPLATFORM endeveit/docker-jq AS deps
-COPY package.json /tmp
-RUN jq '{ dependencies, devDependencies }' < /tmp/package.json > /tmp/deps.json
-
 FROM --platform=$BUILDPLATFORM node:current-alpine AS build
 WORKDIR /activity-roles/
-RUN apk add python3 make g++
+RUN apk add python3 make g++ jq
 RUN npm i -g pnpm
 COPY tsconfig.json pnpm-lock.yaml .
-COPY --from=deps /tmp/deps.json ./package.json
+COPY package.json /tmp
+RUN jq '{ dependencies, devDependencies }' < /tmp/package.json > ./package.json
 RUN pnpm i
 COPY src src
 RUN ./node_modules/typescript/bin/tsc --outDir out/
@@ -22,7 +16,7 @@ RUN npm i -g pnpm
 COPY img/discord-header.png img/discord-header.png
 COPY locales locales
 COPY pnpm-lock.yaml .
-COPY --from=deps /tmp/deps.json ./package.json
+COPY --from=build /activity-roles/package.json ./package.json
 RUN pnpm i -P
 COPY --from=build /activity-roles/out src