summaryrefslogtreecommitdiffstats
path: root/odlsli/src/main/docker/Dockerfile
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-09-20 18:12:52 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-20 18:12:52 +0000
commitd5774749170c8d69db6f1517df9b06f52033bc74 (patch)
tree768af5af222df705ea459b0ccca15ac38a1465f9 /odlsli/src/main/docker/Dockerfile
parent6091574624425966723f22abdb083ad99844f2f4 (diff)
parentb23b39dbc67c7269c6c7cdbff5f9a529e0dffb75 (diff)
Merge "Dependency management for Restconf Client"
Diffstat (limited to 'odlsli/src/main/docker/Dockerfile')
-rw-r--r--odlsli/src/main/docker/Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index 8ba16f01..e787d98a 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -10,6 +10,7 @@ ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.f
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 CCSDK_SLI_PLUGINS_RESTCONF_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-restconf-client/${ccsdk.sli.plugins.version}/xml/features
# copy the opendaylight credentials
COPY idmlight.db.mv.db $ODL_HOME/data
@@ -21,8 +22,8 @@ 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 cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -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 echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_SLI_PLUGINS_RESTCONF_REPO}, ${CCSDK_FEATURES_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all,ccsdk-restconf-client >> $ODL_HOME/etc/org.apache.karaf.features.cfg
# Create odl user
RUN useradd odl