diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-09-20 14:17:15 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-09-20 14:18:25 -0400 |
| commit | b613db03ea41ac152a0edabf1466aa8dc5695f09 (patch) | |
| tree | 5f6a1fbc6f02fd93d800c02d482fe9d7cf703917 /odlsli/src/main | |
| parent | d5774749170c8d69db6f1517df9b06f52033bc74 (diff) | |
Revert "Dependency management for Restconf Client"
This reverts commit b23b39dbc67c7269c6c7cdbff5f9a529e0dffb75.
Change-Id: Idbab8aaed32dd0fa1858851a5d9aab6c6eab28f3
Issue-ID: CCSDK-567
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'odlsli/src/main')
| -rw-r--r-- | odlsli/src/main/docker/Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile index e787d98a..8ba16f01 100644 --- a/odlsli/src/main/docker/Dockerfile +++ b/odlsli/src/main/docker/Dockerfile @@ -10,7 +10,6 @@ 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 @@ -22,8 +21,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_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 +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 # Create odl user RUN useradd odl |