From 84ca6118bd94500146fec385b55ad5a62f85d5a4 Mon Sep 17 00:00:00 2001
From: mkrelle <38019919+mkrelle@users.noreply.github.com>
Date: Fri, 7 Feb 2020 15:09:55 +1100
Subject: [PATCH] Resolves npm dependency issue and libssl-dev issue

Resolves npm dependency issue; and libssl-dev no longer defaults to 1.0 issue.
If npm is not installed on its own, it throws error "The following packages have unmet dependencies: npm : Depends: node-gyp (>= 0.10.9) but it is not going to be installed"
libssl-dev no lopnger defaults to 1.0, and throws error:
"The following packages have unmet dependencies:
 libssl-dev : Conflicts: libssl1.0-dev but 1.0.2n-1ubuntu5.3 is to be installed
 libssl1.0-dev : Conflicts: libssl-dev but 1.1.1-1ubuntu2.1~18.04.5 is to be installed"
---
 web/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index 8668438..7cbaab7 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -22,9 +22,10 @@ add-apt-repository ppa:deadsnakes/ppa -y && \
   apt-get update && \
   apt-get install -y curl git build-essential sudo \
     python3.6 python3-pip python3.6-dev \
-    nodejs npm \
-    postgresql postgresql-contrib \
-    libpq-dev libssl-dev libffi-dev libsasl2-dev libldap2-dev && \
+    nodejs-dev && \
+    apt-get install -y npm && \
+    apt-get install -y postgresql postgresql-contrib \
+    libpq-dev libffi-dev libsasl2-dev libldap2-dev && \
   ln -sf /usr/bin/python3.6 /usr/local/bin/python3 && \
   update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
   update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 && \