From f79d763ae482d783c7075873e70803fbe52d8151 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 8 May 2020 15:28:27 -0400
Subject: [PATCH] Upgrade nodejs version in dgbuilder install

Updated by Sheshi (sc2914@att.com) to upgrade nodejs version as part
of docker build.

Change-Id: I2ab7557fca08f29f9d7881443f02ccb10ce1f0a2
Issue-ID: CCSDK-2353
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 dgbuilder-docker/pom.xml                    | 4 ++--
 dgbuilder-docker/src/main/docker/Dockerfile | 9 ++++++++-
 pom.xml                                     | 2 --
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 6683884b..7eb2dfa3 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.distribution</groupId>
 		<artifactId>distribution-root</artifactId>
-		<version>0.7.2-SNAPSHOT</version>
+		<version>0.7.4-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
 	<artifactId>distribution-dgbuilder-docker</artifactId>
-	<version>0.7.2-SNAPSHOT</version>
+	<version>0.7.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-distribution :: dgbuilder-docker</name>
diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index 9acb7a5c..5c803785 100644
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -4,9 +4,15 @@ MAINTAINER CCSDK  Team (onap-discuss@lists.onap.org)
 
 # Create non-root user
 RUN addgroup --system dgbuilder && adduser --system --ingroup dgbuilder dgbuilder
-
+RUN apt-get update && apt-get install -y curl
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN apt-get install gcc g++ make
+RUN curl -sL 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
 # copy onap
 COPY --chown=dgbuilder:dgbuilder opt /opt
+RUN apt-get update && apt-get install -y yarn nodejs
+RUN node --version
 WORKDIR /opt/onap/ccsdk/dgbuilder
 # Set the proxy if needed
 # RUN npm config set proxy http://your.proxy.com:8080
@@ -16,3 +22,4 @@ RUN cd /opt/onap/ccsdk/dgbuilder/ && npm install
 
 USER dgbuilder
 EXPOSE 3100
+
diff --git a/pom.xml b/pom.xml
index d86f9967..3db39913 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,7 @@
         <module>opendaylight</module>
         <module>odlsli</module>
         <module>dgbuilder</module>
-	<!-- Commented out until CCSDK-2353 is resolved
         <module>dgbuilder-docker</module>
-        -->
         <module>ansible-server</module>
         <module>saltstack-server</module>
     </modules>
-- 
2.16.6