portal: switch to yarn for node packages

materialsproject · Feb 9, 2021 · 3460aa4 · 3460aa4
1 parent fea3834
commit 3460aa4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mpcontribs-portal/Dockerfile b/mpcontribs-portal/Dockerfile
@@ -2,11 +2,16 @@ FROM materialsproject/devops:python-3.91.2 as base
 FROM node:15.8.0-slim as node
 
 FROM node as webpack-deps
-RUN apt-get update && apt-get install -y --no-install-recommends git && apt-get clean
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git curl gnupg ca-certificates apt-transport-https \
+    && apt-get clean
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y --no-install-recommends yarn
 ENV NODE_ENV production
 WORKDIR /app
 COPY package.json .
-RUN npm install && npm prune --production
+RUN yarn install --production
 
 FROM node as webpack
 ENV NODE_ENV production

diff --git a/mpcontribs-portal/package.json b/mpcontribs-portal/package.json
@@ -35,7 +35,7 @@
     "intro.js": "^3.2.1",
     "ion-rangeslider": "^2.3.1",
     "jquery": "^3.5.1",
-    "jquery-form": "github:tschaume/form#master",
+    "jquery-form": "tschaume/form",
     "jquery-simulate": "^1.0.2",
     "jquery-validation": "^1.19.3",
     "js-sha1": "^0.6.0",