From a9967e82dccffea681cf2562eb26d66c00099022 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Mon, 20 Jun 2022 14:52:47 +0530 Subject: Remove hardcoded 'npm' and 'pnpm' versions in 'Dockerfile' [skip ci] (#304) --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b243e7095..b5cf664e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,15 +10,17 @@ ARG USE_SYSTEM_FPM=true # Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true +# Note: 'fpm' is needed for building on ARM machines RUN apt-get update -y \ && apt-get install --no-install-recommends -y rpm ruby gem \ && gem install fpm --no-ri --no-rdoc --no-document WORKDIR /usr/src/ferdium -RUN npm i -g npm@8.12.2 pnpm@7.2.1 - COPY package*.json ./ +COPY .npmrc ./ + +RUN npm i -gf "npm@$(node -p 'require("./package.json").engines.npm')" && npm -v RUN npm i @@ -26,12 +28,14 @@ COPY . . WORKDIR /usr/src/ferdium/recipes +RUN npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v + RUN pnpm i \ && pnpm package WORKDIR /usr/src/ferdium -RUN npm run build +RUN npm run build --dir # -------------------------------------------------------------------------------------------- -- cgit v1.2.3-54-g00ecf