diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-24 08:11:04 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-29 20:03:13 -0400 |
| commit | 6833a016b231f698789cf5e074efd558248db392 (patch) | |
| tree | ab490a1bb16c919b655d9d764697d26f9eda3a19 /odlsli/odlsli-alpine/src | |
| parent | 6f4d63560fefb15b40f63690e57a331995f1affe (diff) | |
Moving CCSDK/Features and ORAN Features to SDNC OAM
Cleaning up Dockerfile and Pom for related items
Issue-ID: CCSDK-3358
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Iea381caf4a9245e6dc65d9d322dd016a2df50a46
Diffstat (limited to 'odlsli/odlsli-alpine/src')
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index be93e531..fd1a7598 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -20,22 +20,13 @@ mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/ 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 SDNR FEATURES -ENV CCSDK_SDNR_FEATURES_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features,\ -mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\ -mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\ -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} +ENV ODL_BOOT_FEATURES_EXTRA ${extra.odl.features},${ccsdk.sli.features} # Backing up existing karaf cfg and updating features boot and features repository 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},${CCSDK_SDNR_FEATURES_REPO} |" $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 \ @@ -56,7 +47,8 @@ LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" USER root ENV JAVA_HOME /opt/java/openjdk -ENV PATH ${JAVA_HOME}/bin:$PATH +ENV PATH $PATH:/opt/java/openjdk/bin + ENV ODL_HOME /opt/opendaylight/current ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} |