From 3bddc1ee17ef8c3e6e803b5d143f6d161ae4daa2 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 25 Sep 2021 12:31:49 +0530 Subject: chore: refactor Dockerfile to make use of layer cache when installing npm modules. [skip ci] --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index d3589005b..821b7a808 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,16 @@ RUN apt-get update -y \ WORKDIR /usr/src/ferdi RUN npm i -g pnpm@6.14.7 \ - && npm i -g node-gyp@8.1.0 \ - && npm i -g lerna@4.0.0 + && npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 \ + && npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 -COPY . . +COPY package*.json . +COPY lerna.json . + +RUN npm i \ + && npx lerna bootstrap -# 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 -RUN npx lerna bootstrap +COPY . . WORKDIR /usr/src/ferdi/recipes -- cgit v1.2.3-70-g09d2 From dc4aa9d7912da85b135ed94ec0f3dc1a17b21953 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Sun, 3 Oct 2021 20:14:38 +0530 Subject: chore: upgrade 'pnpm' to '6.16.0' (#2014) --- .github/workflows/dependency-updates.yml | 2 +- .github/workflows/ferdi-builds.yml | 6 +++--- CONTRIBUTING.md | 2 ++ Dockerfile | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'Dockerfile') diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index d41ded354..eafa6645e 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -55,7 +55,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.14.7 + version: 6.16.0 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 199ec95bf..062243659 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml @@ -152,7 +152,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.14.7 + version: 6.16.0 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp @@ -256,7 +256,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.14.7 + version: 6.16.0 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp @@ -381,7 +381,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.14.7 + version: 6.16.0 - name: Uninstall locally and reinstall global npm modules run: | npm uninstall node-gyp diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0c5014a8..76ad5266b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,6 +67,8 @@ node -v v14.17.6 npm -v 6.14.13 +pnpm -v +6.16.0 ``` _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). diff --git a/Dockerfile b/Dockerfile index 821b7a808..cb3053708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update -y \ WORKDIR /usr/src/ferdi -RUN npm i -g pnpm@6.14.7 \ +RUN npm i -g pnpm@6.16.0 \ && npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0 \ && npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0 -- cgit v1.2.3-70-g09d2