From 9fa42d725d8f1dd1a44a7dd159074dc58703117c Mon Sep 17 00:00:00 2001
From: Yury Kylulin <yury.kylulin@intel.com>
Date: Fri, 29 Jan 2021 14:57:36 +0300
Subject: Add rapid script sources in the image

Make image more universal and add rapid scripts for mgmt from the container.

Signed-off-by: Yury Kylulin <yury.kylulin@intel.com>
Change-Id: Ia46a8e147f978dd64bfe6c7b44f7dff92e241855
---
 VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile     |  1 +
 .../helper-scripts/rapid/deploycentostools.sh      | 38 ++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'VNFs/DPPD-PROX')

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile b/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile
index c4a4b063..a62c5dc4 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile
@@ -36,6 +36,7 @@ ARG BUILD_DIR=/opt/rapid
 
 COPY ./deploycentostools.sh ${BUILD_DIR}/
 COPY --from=builder ${BUILD_DIR}/install_components.tgz ${BUILD_DIR}/install_components.tgz
+COPY --from=builder ${BUILD_DIR}/src ${BUILD_DIR}/src
 
 RUN chmod a+rwx ${BUILD_DIR} && chmod +x ${BUILD_DIR}/deploycentostools.sh \
  && ${BUILD_DIR}/deploycentostools.sh -k runtime_image
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index 47ddaaaa..e5199257 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
@@ -146,15 +146,15 @@ function dpdk_install()
 	pushd ${RTE_SDK} > /dev/null 2>&1
 	make config T=${RTE_TARGET}
 	# Starting from DPDK 20.05, the IGB_UIO driver is not compiled by default.
-    # Uncomment the sed command to enable the driver compilation
-    #${SUDO} sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/c\/CONFIG_RTE_EAL_IGB_UIO=y' ${RTE_SDK}/build/.config
+	# Uncomment the sed command to enable the driver compilation
+	#${SUDO} sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/c\/CONFIG_RTE_EAL_IGB_UIO=y' ${RTE_SDK}/build/.config
 
 	# For Kubernetes environment we use host vfio module
 	if [ "${K8S_ENV}" == "y" ]; then
 		sed -i 's/CONFIG_RTE_EAL_IGB_UIO=y/CONFIG_RTE_EAL_IGB_UIO=n/g' ${RTE_SDK}/build/.config
 		sed -i 's/CONFIG_RTE_LIBRTE_KNI=y/CONFIG_RTE_LIBRTE_KNI=n/g' ${RTE_SDK}/build/.config
 		sed -i 's/CONFIG_RTE_KNI_KMOD=y/CONFIG_RTE_KNI_KMOD=n/g' ${RTE_SDK}/build/.config
-    fi
+	fi
 
 	# Compile with MB library
 	sed -i '/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n/c\CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y' ${RTE_SDK}/build/.config
@@ -165,23 +165,26 @@ function dpdk_install()
 
 function prox_compile()
 {
-	# Compile PROX
-	pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
-	make -j`getconf _NPROCESSORS_ONLN`
-	${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox
-	popd > /dev/null 2>&1
+    # Compile PROX
+    pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
+    make -j`getconf _NPROCESSORS_ONLN`
+    ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox
+    popd > /dev/null 2>&1
 }
 
 function prox_install()
 {
-	# Clone and compile PROX
-	pushd ${BUILD_DIR} > /dev/null 2>&1
-	git clone https://git.opnfv.org/samplevnf
-	pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX > /dev/null 2>&1
-	bash -c "${PROX_CHECKOUT}"
-	popd > /dev/null 2>&1
-	prox_compile
-	popd > /dev/null 2>&1
+    # Clone PROX
+    pushd ${BUILD_DIR} > /dev/null 2>&1
+    git clone https://git.opnfv.org/samplevnf
+    bash -c "${PROX_CHECKOUT}"
+    echo "${PROX_CHECKOUT}" > ${BUILD_DIR}/commit_id
+    cp -R ./samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid ./src
+    popd > /dev/null 2>&1
+    prox_compile
+
+    # Clean build folder
+    rm -rf ${BUILD_DIR}/samplevnf
 }
 
 function port_info_build()
@@ -200,6 +203,7 @@ function create_minimal_install()
 
 	echo "${BUILD_DIR}/prox" >> ${BUILD_DIR}/list_of_install_components
 	echo "${BUILD_DIR}/port_info_app" >> ${BUILD_DIR}/list_of_install_components
+	echo "${BUILD_DIR}/commit_id" >> ${BUILD_DIR}/list_of_install_components
 
 	tar -czvhf ${BUILD_DIR}/install_components.tgz -T ${BUILD_DIR}/list_of_install_components
 }
@@ -223,7 +227,7 @@ function k8s_runtime_image()
 
 	ldconfig
 
-	#rm -rf ${BUILD_DIR}/install_components.tgz
+	rm -rf ${BUILD_DIR}/install_components.tgz
 }
 
 function print_usage()
-- 
cgit 1.2.3-korg