X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=024043b64f40e1efc7f06f51a5d9c73eea0e7012;hp=2719102e74315b9626931962fcda90c3b359cd2e;hb=a8e9cf344e47ddca11b856e3b442da15f670826c;hpb=1f8c95ab7ae772e2f6945f05ac19006ffb892e22

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 2719102e..024043b6 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -1,6 +1,27 @@
-# Base ubuntu with added packages needed for open ecomp
+# Prepare stage for multistage image build
+## START OF STAGE0 ##
+FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
+
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV ODL_HOME /opt/opendaylight
+
+# copy the opendaylight credentials
+COPY idmlight.db.mv.db $ODL_HOME/data
+
+# copy CCSDK mvn artifacts to ODL repository
+COPY system /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME
+
+# copy deliverables to opt
+COPY opt /opt
+COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
+## END OF STAGE0 ##
+
+
 FROM ${base.image.name}:${project.docker.latestfulltag.version}
+
 MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+
 ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 ENV ODL_HOME /opt/opendaylight
 ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
@@ -13,45 +34,23 @@ ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
 ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 
-# copy the opendaylight credentials
-COPY idmlight.db.mv.db $ODL_HOME/data
-
+# Install sudo and IP utilities
+RUN apk update && apk --no-cache add sudo iputils openssl
 
-# copy CCSDK mvn artifacts to ODL repository
-COPY system /tmp/system
-RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
 
-# Add CCSDK repositories to boot repositories
-RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
-#RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${CCSDK_FEATURES_SDNR_WT_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+# Enable wheel group
+RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
 
 # Create odl user
 RUN addgroup -S odl && adduser -S odl -G odl
+RUN addgroup odl wheel
 
-# Install ansible
-#COPY ansible-sources.list /etc/apt/sources.list.d
-#RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv ${ANSIBLE_GPG_KEY} && \
-#    gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \
-#    apk update && \
-#    apk add -y ansible
-
-# Install ansible-opendaylight
-#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight
+COPY --from=stage0 --chown=odl:odl /opt /opt
 
-# Copy ccsdk install playbook
-#COPY install_ccsdk.yml /tmp
-
-# Install features in ODL
-#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml
-
-
-# copy deliverables to opt
-COPY --chown=odl:odl opt /opt
-COPY --chown=odl:odl org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg
-
-RUN chown -R odl:odl /opt
+# Add CCSDK repositories to boot repositories
+RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 USER odl
 ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh