X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=dd96594cdf47dcdc6d5be55dc5a76990aa68c497;hb=545f4f8d8895d2b95ec766aa76fbbd135136e570;hp=97c5ae4cba5ddb309c943b205b5a6355eb0eb25c;hpb=c6f21bed9c8144d5195232d28dfd1d1f9f1373e6;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 97c5ae4c..dd96594c 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -1,9 +1,7 @@
 # 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
+USER root
 
 # copy the opendaylight credentials
 COPY idmlight.db.mv.db $ODL_HOME/data
@@ -15,38 +13,50 @@ 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
+
+# CCSDK SLI
+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_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
+
+# CCSDK Features
+ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
+ENV CCSDK_FEATURES_A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
+ENV CCSDK_FEATURES_SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-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,\
+ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\
+ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\
+ mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features
+
+# ODL and CCSDK SLI featuresBoot defined in pom.xml
+ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
+
+RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+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},${CCSDK_FEATURES_A1ADAPTER_NORTHBOUND_REPO},${CCSDK_FEATURES_SDNR_NORTHBOUND_REPO},${CCSDK_FEATURES_SDNR_WT_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg
+
 ## END OF STAGE0 ##
 
 
+## This will create actual image
 FROM ${base.image.name}:${project.docker.latestfulltag.version}
+LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
+USER root
 
-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_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 ANSIBLE_GPG_KEY ${ansible.gpg.key}
-ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
+ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
 
 # Install sudo and IP utilities
-RUN apk update && apk --no-cache add sudo iputils openssl
-
-# Enable wheel group
-RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
+RUN apk update \
+    && apk --no-cache add sudo iputils openssl \
+    && sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
+    && addgroup -S odl \
+    && adduser -S odl -G odl \
+    && 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}|"  $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