From ae59c86f0add8fb4667729bc6f1a8e0604e97fc8 Mon Sep 17 00:00:00 2001
From: Saikrishna Edupuganti <saikrishna.edupuganti@intel.com>
Date: Mon, 22 Jun 2020 03:03:48 +0000
Subject: [PATCH] Copy modules folder for bessd to load .so files

I0622 03:01:52.720116     1 bessd.cc:456] Loading plugin (attempt 1): /bin/modules/sequential_update.so

RoundRobin       splits packets evenly with round robin
SequentialUpdate updates packet data sequentially in a range
SetMetadata      Set metadata attributes to packets

Signed-off-by: Saikrishna Edupuganti <saikrishna.edupuganti@intel.com>
---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 20de8e2cc..20084e6e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,11 +60,13 @@ COPY core/ core/
 COPY patches/bess patches
 RUN cp -a ${DPDK_DIR} deps/dpdk-19.11.1 && \
     cat patches/* | patch -p1
-RUN ./build.py bess && \
+RUN ./build.py --plugin sample_plugin bess && \
     cp bin/bessd /bin && \
+    mkdir -p /bin/modules && \
+    cp core/modules/*.so /bin/modules && \
     mkdir -p /opt/bess && \
     cp -r bessctl pybess /opt/bess && \
-    cp -a core/pb /pb
+    cp -r core/pb /pb
 
 # Stage pip: compile psutil
 FROM python:2.7-slim AS pip
@@ -90,7 +92,8 @@ RUN apt-get update && \
         https://github.com/secdev/scapy/archive/b65e795c62accd383e1bb6b17cd9f7a9143ae117.zip
 COPY --from=pip /usr/local/lib/python2.7/site-packages/psutil /usr/local/lib/python2.7/site-packages/psutil
 COPY --from=bess-build /opt/bess /opt/bess
-COPY --from=bess-build /bin/bessd /bin
+COPY --from=bess-build /bin/bessd /bin/bessd
+COPY --from=bess-build /bin/modules /bin/modules
 COPY conf /opt/bess/bessctl/conf
 RUN ln -s /opt/bess/bessctl/bessctl /bin
 ENV PYTHONPATH="/opt/bess"