Refactoring DockerFile

Combine multiple RUN statements to reduce image layers

Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Iebd8e0954eda108a409752b3e6e802a03e429c61

diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index 974647e..a2b9291 100644 (file)
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -2,25 +2,22 @@
 FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
 MAINTAINER CCSDK  Team (onap-discuss@lists.onap.org)
 
-# Create non-root user
 USER root
-RUN addgroup -S dgbuilder && adduser -S dgbuilder -G dgbuilder
 
-RUN apk --no-cache add curl
-#RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-RUN apk add gcc g++ make ncurses
+RUN addgroup -S dgbuilder && adduser -S dgbuilder -G dgbuilder \
+    && apk --no-cache add curl \
+    && apk add gcc g++ make ncurses \
+    && apk update && apk add yarn nodejs \
+    && node --version
 
-# copy onap
 COPY --chown=dgbuilder:dgbuilder opt /opt
-RUN apk update && apk add 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
 RUN cd /opt/onap/ccsdk/dgbuilder/ && npm config set strict-ssl false && npm install
 
 #ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0
-
 USER dgbuilder
 EXPOSE 3100
-