From 0b9839e70cb6a3ba1328f37792d33cd1896309ef Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 1 Sep 2020 16:21:53 -0400 Subject: Update to use ONAP standard base images Updated all containers to use one of the 2 approved ONAP base images: - onap/integration-java11 - onap/integration-python Change-Id: I961e9af38d790f74528a726a0fc68d1a2e5fbfb9 Issue-ID: CCSDK-2418 Signed-off-by: Dan Timoney --- dgbuilder-docker/src/main/docker/Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'dgbuilder-docker/src/main/docker') diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile index 5c803785..1c3a4034 100644 --- a/dgbuilder-docker/src/main/docker/Dockerfile +++ b/dgbuilder-docker/src/main/docker/Dockerfile @@ -1,22 +1,23 @@ -# Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version} +# Base standard ONAP java base image with added packages needed for nodered +FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} 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 +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 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 +RUN apk add gcc g++ make ncurses + # copy onap COPY --chown=dgbuilder:dgbuilder opt /opt -RUN apt-get update && apt-get install -y yarn nodejs +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 install +RUN cd /opt/onap/ccsdk/dgbuilder/ && npm config set strict-ssl false && npm install #ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0 -- cgit 1.2.3-korg