From 3460aa4945be2426a3f64ff7f121450e7e951d10 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Mon, 8 Feb 2021 21:48:35 -0800
Subject: [PATCH] portal: switch to yarn for node packages

---
 mpcontribs-portal/Dockerfile   | 9 +++++++--
 mpcontribs-portal/package.json | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mpcontribs-portal/Dockerfile b/mpcontribs-portal/Dockerfile
index c588c1211..b8f706337 100644
--- 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
index 6aa7eb73b..8e8a2f9bd 100644
--- 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",