X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=8ea9e1acca02f90ab7666956fd91997ad7969e68;hb=6989e98ea8d2293aa90aacc1b864fb724643156e;hp=48000642b09991d9e2657b32bad6f4ea1ce7f0d6;hpb=164b7939fd3bc3e43c8dfdc00ee5827dc55adef2;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 4800064..8ea9e1a 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
 # ============LICENSE_START==========================================
 # ONAP : APPC
 # ===================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -21,25 +21,35 @@
 # ============LICENSE_END============================================
 
 # Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-image:0.3.0-SNAPSHOT
+FROM onap/ccsdk-odlsli-alpine-image:0.5.1
 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
+
 # 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
 
 # Copy the opt folder to the container's /opt folder
-COPY opt /opt
+COPY --chown=odl:odl opt /opt
+
+#Copy the directory containing each features' install script
+COPY --chown=odl:odl featureDir /opt/onap/appc/features
 
-# We are keeping the feature installers in their
-# own folders in the docker staging repository.
-# The number of feature directories is defined in
-# the installZips.sh file.
-COPY featureDir1 /opt/onap/appc/features
-COPY featureDir2 /opt/onap/appc/features
-COPY featureDir3 /opt/onap/appc/features
-COPY featureDir4 /opt/onap/appc/features
+#Copy the directory containing a system folder and an etc folder in order
+#  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
 
+# cvass dir stores VNF's configure via Audit or Sync LCM
+RUN mkdir /opt/onap/appc/cvaas
+
+#Start opendaylight and pre-install the appc features
+#RUN opt/onap/appc/bin/dockerInstall.sh
+
 # Expose port 8181 for ODL REST calls
 EXPOSE 8181