<opendaylight.root>opt/opendaylight</opendaylight.root>
<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
+ <!-- ODL Features Boot -->
<extra.odl.features>
odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
</extra.odl.features>
+ <!-- SLI Features Boot -->
<ccsdk.sli.features>
ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
</ccsdk.sli.features>
+ <!-- SLI Features Repositories -->
+ <ccsdk.sli.features.repo>
+ mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features,\
+ mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features,\
+ mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\
+ mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features
+ </ccsdk.sli.features.repo>
<docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
</properties>
COPY opt /opt
COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
-# CCSDK SLI FEATURES
-ENV CCSDK_SLI_FEATURES_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.version}/xml/features,\
-mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/features,\
-mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\
-mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features
-
-# ODL and CCSDK SLI featuresBoot defined in pom.xml
-ENV ODL_BOOT_FEATURES_EXTRA ${extra.odl.features},${ccsdk.sli.features}
-
-# Backing up existing karaf cfg and updating features boot and features repository
+# Backing up existing karaf cfg and updating features boot and features repositories defined in pom.xml
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_FEATURES_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg
-
-# Enable wheel and create a group and user
-RUN 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
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${extra.odl.features},${ccsdk.sli.features}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|,${ccsdk.sli.features.repo}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
# Changing ownership and permission of /opt
RUN chown -R odl:odl /opt && chmod -R 755 /opt
&& ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
&& ln -s /opt/opendaylight /opt/opendaylight/current
+# Enable wheel and create a group and user
+RUN 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
+
# Patch some opendaylight artifacts
COPY system $ODL_HOME/system
+
# Add missing scripts see SDNC-1056
#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/
#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt
+# Changing ownership and permission of /opt
+RUN chown -R odl:odl /opt && chmod -R 755 /opt
+
## END OF STAGE0 ##
#################################################
MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
USER root
-ENV JAVA_HOME /opt/java/openjdk
-ENV ODL_HOME /opt/opendaylight/current
+ENV JAVA_HOME=/opt/java/openjdk \
+ PATH=$PATH:/opt/java/openjdk/bin \
+ ODL_HOME=/opt/opendaylight/current
# Copy Everything from stage0
COPY --from=stage0 / /
-# ENTRYPOINT exec /opt/opendaylight/bin/karaf
-WORKDIR $ODL_HOME
-USER onap
+USER odl
EXPOSE 8181
+WORKDIR $ODL_HOME
+# ENTRYPOINT exec /opt/opendaylight/bin/karaf