summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine/src
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-04 06:18:07 -0700
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-04 06:18:07 -0700
commit3426127f3a2bedcdda2648966e56956d3db67bd6 (patch)
tree93ea064ddcb604e1c2084f4c5ca9027d3c50c004 /odlsli/odlsli-alpine/src
parent04f1074d99f7216bcd5268d0198b78ad9d514515 (diff)
Fix error in Dockerfile
Fix error in Dockerfile introduced when resolving merge conflict Change-Id: Ie5e70afea93a0ef67bd4047b9e455ff1b64c7a13 Issue-ID: SDNC-712 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli/odlsli-alpine/src')
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 87972eba..5dbf8d4c 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -24,9 +24,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
-<<<<<<< HEAD
-#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 "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${CCSDK_FEATURES_SDNR_WT_REPO}|" $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}|" $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
# Create odl user