X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=4b2080c8580315570fc74b1f20ba381e6c027728;hb=75b03b9079d049a83ac88dce63317251f1d130a0;hp=8b2addf8e480cdf6ae17e28dc3217cc5b7cf0b40;hpb=49b130c5fee07da0fbe7f81cad6553c4bbb82061;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 8b2addf..4b2080c 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,11 +1,47 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM ecomp/sdnc-image:1.0.0-SNAPSHOT
+# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
+
+# Base ubuntu with added packages needed for ONAP
+FROM onap/ccsdk-odlsli-alpine-image:0.4.1
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
-# copy openecomp
-COPY opt /opt
+# 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 --chown=odl:odl opt /opt
+
+#Copy the directory containing each features' install script
+COPY --chown=odl:odl featureDir /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
 
-RUN ln -s /opt/openecomp/appc /opt/appc
+#Start opendaylight and pre-install the appc features
+RUN opt/onap/appc/bin/dockerInstall.sh
 
-# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
+# Expose port 8181 for ODL REST calls
 EXPOSE 8181