diff options
author | Vijay A <avijayr@protonmail.com> | 2021-09-09 17:19:55 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-09-09 17:19:55 +0530 |
commit | 04795a2d7ecf5fea498fc7be7d3621a24108ac56 (patch) | |
tree | 7317ed8fdbb12eebce5e23e0efae32350f778589 | |
parent | Revert "fix: U2F devices not recognised in snapcraft image (#1892)" (diff) | |
download | ferdium-app-04795a2d7ecf5fea498fc7be7d3621a24108ac56.tar.gz ferdium-app-04795a2d7ecf5fea498fc7be7d3621a24108ac56.tar.zst ferdium-app-04795a2d7ecf5fea498fc7be7d3621a24108ac56.zip |
chore: use 'pnpm' for the Docker builds of the 'recipes'. [skip ci]
-rw-r--r-- | Dockerfile | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile index e46da8ac9..d3589005b 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -2,8 +2,6 @@ | |||
2 | 2 | ||
3 | FROM docker.io/library/node:14.17.6-buster as builder | 3 | FROM docker.io/library/node:14.17.6-buster as builder |
4 | 4 | ||
5 | # TODO: Need to setup a non-root user for security purposes | ||
6 | |||
7 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" | 5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" |
8 | 6 | ||
9 | ARG DEBIAN_FRONTEND=noninteractive | 7 | ARG DEBIAN_FRONTEND=noninteractive |
@@ -18,7 +16,8 @@ RUN apt-get update -y \ | |||
18 | 16 | ||
19 | WORKDIR /usr/src/ferdi | 17 | WORKDIR /usr/src/ferdi |
20 | 18 | ||
21 | RUN npm i -g node-gyp@8.1.0 \ | 19 | RUN npm i -g pnpm@6.14.7 \ |
20 | && npm i -g node-gyp@8.1.0 \ | ||
22 | && npm i -g lerna@4.0.0 | 21 | && npm i -g lerna@4.0.0 |
23 | 22 | ||
24 | COPY . . | 23 | COPY . . |
@@ -26,18 +25,18 @@ COPY . . | |||
26 | # Note: Ideally this needs to be done before the COPY step - BUT moving this here resolves the issue with `preval-build-info-cli` not being found | 25 | # Note: Ideally this needs to be done before the COPY step - BUT moving this here resolves the issue with `preval-build-info-cli` not being found |
27 | RUN npx lerna bootstrap | 26 | RUN npx lerna bootstrap |
28 | 27 | ||
29 | RUN cd recipes \ | 28 | WORKDIR /usr/src/ferdi/recipes |
30 | && npm i \ | 29 | |
31 | && npm run package \ | 30 | RUN pnpm i \ |
32 | && cd .. | 31 | && pnpm run package |
32 | |||
33 | WORKDIR /usr/src/ferdi | ||
33 | 34 | ||
34 | RUN npm run build | 35 | RUN npm run build |
35 | 36 | ||
36 | # -------------------------------------------------------------------------------------------- | 37 | # -------------------------------------------------------------------------------------------- |
37 | 38 | ||
38 | FROM docker.io/library/busybox | 39 | FROM docker.io/library/busybox:latest |
39 | |||
40 | # TODO: Need to setup a non-root user for security purposes | ||
41 | 40 | ||
42 | WORKDIR /ferdi | 41 | WORKDIR /ferdi |
43 | 42 | ||