diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2022-06-20 14:52:47 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-20 09:22:47 +0000 |
commit | a9967e82dccffea681cf2562eb26d66c00099022 (patch) | |
tree | a26fd6b67ee068af8bfa9ee34acab047e07c968b /Dockerfile | |
parent | Change to correct subreddit after sucessful post on test [skip ci] (#306) (diff) | |
download | ferdium-app-a9967e82dccffea681cf2562eb26d66c00099022.tar.gz ferdium-app-a9967e82dccffea681cf2562eb26d66c00099022.tar.zst ferdium-app-a9967e82dccffea681cf2562eb26d66c00099022.zip |
Remove hardcoded 'npm' and 'pnpm' versions in 'Dockerfile' [skip ci] (#304)
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index b243e7095..b5cf664e6 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -10,15 +10,17 @@ ARG USE_SYSTEM_FPM=true | |||
10 | # Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module | 10 | # Note: Added to bypass the error with missing git repo information for the 'preval-build-info' module |
11 | ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true | 11 | ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true |
12 | 12 | ||
13 | # Note: 'fpm' is needed for building on ARM machines | ||
13 | RUN apt-get update -y \ | 14 | RUN apt-get update -y \ |
14 | && apt-get install --no-install-recommends -y rpm ruby gem \ | 15 | && apt-get install --no-install-recommends -y rpm ruby gem \ |
15 | && gem install fpm --no-ri --no-rdoc --no-document | 16 | && gem install fpm --no-ri --no-rdoc --no-document |
16 | 17 | ||
17 | WORKDIR /usr/src/ferdium | 18 | WORKDIR /usr/src/ferdium |
18 | 19 | ||
19 | RUN npm i -g npm@8.12.2 pnpm@7.2.1 | ||
20 | |||
21 | COPY package*.json ./ | 20 | COPY package*.json ./ |
21 | COPY .npmrc ./ | ||
22 | |||
23 | RUN npm i -gf "npm@$(node -p 'require("./package.json").engines.npm')" && npm -v | ||
22 | 24 | ||
23 | RUN npm i | 25 | RUN npm i |
24 | 26 | ||
@@ -26,12 +28,14 @@ COPY . . | |||
26 | 28 | ||
27 | WORKDIR /usr/src/ferdium/recipes | 29 | WORKDIR /usr/src/ferdium/recipes |
28 | 30 | ||
31 | RUN npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v | ||
32 | |||
29 | RUN pnpm i \ | 33 | RUN pnpm i \ |
30 | && pnpm package | 34 | && pnpm package |
31 | 35 | ||
32 | WORKDIR /usr/src/ferdium | 36 | WORKDIR /usr/src/ferdium |
33 | 37 | ||
34 | RUN npm run build | 38 | RUN npm run build --dir |
35 | 39 | ||
36 | # -------------------------------------------------------------------------------------------- | 40 | # -------------------------------------------------------------------------------------------- |
37 | 41 | ||