X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=ea6f41f764650e3d89e6ffe4943b9fbd07bce388;hb=1a75e4824ab39c493f405d8791dc62999b273f94;hp=47b120816940be58055fb9efe1b1fe74d9f4f1ca;hpb=aa9d825d1d6be1b9bd9611b27607735f6ae1db88;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 47b12081..ea6f41f7 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -1,54 +1,52 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM ${base.image.name}:${project.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
-ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
-ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
-ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
-ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
-ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
-ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
-ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
+# Prepare stage for multistage image build
+## START OF STAGE0 ##
+FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
 
 # 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 && rm -rf /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME
 
-# 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
+# copy deliverables to opt
+COPY opt /opt
+COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
+## END OF STAGE0 ##
 
-# Create odl user
-RUN adduser -S odl
+FROM ${base.image.name}:${project.docker.latestfulltag.version}
 
-# 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
+LABEL maintainer="CCSDK  Team (onap-ccsdk@lists.onap.org)"
 
-# Install ansible-opendaylight
-#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight
+ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
+ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
+ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
+ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
+ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
+ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
+ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
+ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
+ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
+ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 
-# Copy ccsdk install playbook
-#COPY install_ccsdk.yml /tmp
+# Install sudo and IP utilities
+RUN apk update && apk --no-cache add sudo iputils openssl
 
-# Install features in ODL
-#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml
 
+# Enable wheel group
+RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
 
-# copy deliverables to opt
-COPY opt /opt
-COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg
+# Create odl user
+RUN addgroup -S odl && adduser -S odl -G odl
+RUN addgroup odl wheel
+
+COPY --from=stage0 --chown=odl:odl /opt /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}, ${A1ADAPTER_NORTHBOUND_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
-EXPOSE 8181