From 0c64368ba5dfd07f66373a221e50d5cd4cfd7be2 Mon Sep 17 00:00:00 2001
From: goei <JsXLRu>
Date: Thu, 30 Jul 2020 10:59:36 +0200
Subject: [PATCH] TMSS-272: Fix npm issue in SAS CI docker

---
 Docker/lofar-ci/Dockerfile_ci_sas | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Docker/lofar-ci/Dockerfile_ci_sas b/Docker/lofar-ci/Dockerfile_ci_sas
index 1fadbf0f606..be3799a44d6 100644
--- a/Docker/lofar-ci/Dockerfile_ci_sas
+++ b/Docker/lofar-ci/Dockerfile_ci_sas
@@ -18,9 +18,12 @@ ENV PATH /usr/pgsql-9.6/bin:$PATH
 
 RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet
 
-RUN npm install -g npx && \
-    npm install -g n && \
-    n stable && \
+# Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting.
+RUN echo "Installing Nodejs packages..." && \
+    curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
+    yum install -y nodejs && \
+    npm -v && \
+    node -v && \
     npm install -g serve
 
 USER lofarsys
\ No newline at end of file
-- 
GitLab