X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=56e66a8992736d2825d13bdf5898514073c49216;hb=105b7cdfec533c7b9976209af6af73e2f2508512;hp=b1e6a88a30bc48ff807ad3126d55ad3c31620d8e;hpb=7480619227377cade2f2119865a87b41641314c5;p=appc%2Fdeployment.git diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile index b1e6a88..56e66a8 100644 --- a/installation/appc/src/main/docker/Dockerfile +++ b/installation/appc/src/main/docker/Dockerfile @@ -21,9 +21,15 @@ # ============LICENSE_END============================================ # Base ubuntu with added packages needed for ONAP -FROM onap/ccsdk-odlsli-alpine-image:0.4.1 +FROM onap/ccsdk-odlsli-alpine-image:0.6.3 MAINTAINER APP-C Team (appc@lists.openecomp.org) +# run as root to install ps to comply with karaf scripts +USER root +RUN apk add --no-cache procps +RUN apk add --no-cache openssh +RUN apk add --no-cache sshpass + # Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image) ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties @@ -37,6 +43,7 @@ COPY --chown=odl:odl featureDir /opt/onap/appc/features # to merge both of these with the opendaylight folders of the same names. COPY --chown=odl:odl repoDir /opt/opendaylight RUN chown -R odl:odl /opt + USER odl RUN ln -s /opt/onap/appc /opt/appc @@ -44,7 +51,7 @@ RUN ln -s /opt/onap/appc /opt/appc RUN mkdir /opt/onap/appc/cvaas #Start opendaylight and pre-install the appc features -RUN opt/onap/appc/bin/dockerInstall.sh +#RUN opt/onap/appc/bin/dockerInstall.sh # Expose port 8181 for ODL REST calls EXPOSE 8181