Move to release parent
Move to 1.5.2 parent
Issue-ID: OAM-67
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: Icd2b49ce0b15a06ba753080418db2d6e65edfeb4
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
diff --git a/distribution/nonrtric-o1-controller-frankfurt/pom.xml b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
index cdf07f1..df327ce 100644
--- a/distribution/nonrtric-o1-controller-frankfurt/pom.xml
+++ b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
@@ -23,7 +23,8 @@
</organization>
<properties>
- <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z</base.image.repo>
+ <base.image.repo>hightec/sdnc-image-wt-patch:latest</base.image.repo>
+ <!--<base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z</base.image.repo>-->
<image.name>o-ran-sc/${project.artifactId}</image.name>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<o-ran-sc.project.version>${project.version}</o-ran-sc.project.version>
diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
index 9482d2f..79bafef 100644
--- a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
+++ b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
@@ -1,7 +1,12 @@
# Base odl alpine with added packages needed for
FROM ${base.image.repo}
-ENV SDNR_ORAN_REPO ${features.repo}
-RUN sed -i -e "\|featuresRepositories|s|$|,${SDNR_ORAN_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+# Image info
+ENV IMAGEPATH ${IMAGEPATH}//${image.name}
+ENV IMAGENAMES ${IMAGENAMES}//"ORAN nonrtric"
+
+# Adjust repo und feature boot info for karaf
+RUN sed -i -e "\|featuresRepositories|s|$|,${features.repo}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
ENV SDNRWT_BOOTFEATURES ${features.boot}
USER root