commit 7c3a1e00c7f52cb713f7521560978f31ffb9f49b
author Joey Armstrong <joey@opennetworking.org> Sat Jul 01 16:21:24 2023 -0400
committer Joey Armstrong <joey@opennetworking.org> Wed Jul 05 12:17:57 2023 +0000
tree eb5f41509d70358026b630987d88481e7913ca57
parent 99a72d0126e5ab03b02c19cfba716ee3336953cf

[VOL-5031] - Fix org.onosproject.segmentrouting not found.

Makefile
--------
  o Add comment banners between targets for readability.

Dockerfile.voltha-onos
etc/mkdir-touch-active.sh
-------------------------
  o Dockerfile has a growing list of directories that ops are applied to.
  o Refactor logic into a shell script then pass in a list of directories.
  o Directory segmentrouting must not exist in the onos artifact installed.

Change-Id: Ibf500fd39261d7c2cc019595b7edd5be95a79c0e

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index a884996..c48185a 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -53,7 +53,7 @@
 
 # Install the applications
 COPY app-install.sh ./app-install.sh
-RUN chmod 755 ./app-install.sh
+RUN chmod 755 app-install.sh
 RUN ./app-install.sh
 
 
@@ -73,13 +73,24 @@
 COPY --from=install ${APPS_ROOT}/ ${APPS_ROOT}/
 COPY network-cfg.json $KARAF_ROOT/../config/network-cfg.json
 
-RUN touch $ONOS/apps/org.onosproject.hostprovider/active
-RUN touch $ONOS/apps/org.onosproject.openflow-base/active
-RUN touch $ONOS/apps/org.onosproject.lldpprovider/active
-RUN touch $ONOS/apps/org.onosproject.mcast/active
-RUN touch $ONOS/apps/org.onosproject.segmentrouting/active
+## -----------------------------------------------------------------------
+## Intent: Create package install directories.
+## -----------------------------------------------------------------------
+COPY etc/mkdir-touch-active.sh .
+RUN chmod 555 mkdir-touch-active.sh
+RUN ./mkdir-touch-active.sh\
+  $ONOS/apps/org.onosproject.hostprovider\
+  $ONOS/apps/org.onosproject.openflow-base\
+  $ONOS/apps/org.onosproject.lldpprovider\
+  $ONOS/apps/org.onosproject.mcast\
+  $ONOS/apps/org.onosproject.segmentrouting
 
+## [DEBUG]
+## RUN find "$ONOS/apps" -ls; exit 1
+
+## -----------------------------------------------------------------------
 # Label image
+## -----------------------------------------------------------------------
 ARG org_label_schema_version=unknown
 ARG org_label_schema_vcs_url=unknown
 ARG org_label_schema_vcs_ref=unknown
@@ -93,3 +104,5 @@
       org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
       org.label-schema.build-date=$org_label_schema_build_date \
       org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+
+# [EOF]
\ No newline at end of file