From 5efcdda3cc2d4e0333cce4a872ae3de4d3e3710b Mon Sep 17 00:00:00 2001 From: Yury Kylulin Date: Wed, 3 Jun 2020 14:04:25 +0000 Subject: Fix for containers to use /opt/rapid Fix scripts and build procedure to use /opt/rapid as a main directory for binaries and config files. Signed-off-by: Yury Kylulin Change-Id: Icb38c37a85a78a6f2de2e751df5fafd624b4f1b3 --- VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh') diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh index 3d77aaed..e0f38ade 100755 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh @@ -24,12 +24,14 @@ DOCKER_REGISTRY="localhost:5000" USE_DOCKER_CACHE="n" +IMAGE_BUILD_LOG="dockerimage-build.log" + function create_ssh_key() { if [ -f ./${RSA_KEY_FILE_NAME} ]; then read -p "RSA key already exist! Do you want to remove it (yYnN)?" -n 1 -r - if [ "$REPLY" == "y" ] || [ "$REPLY" == "Y" ]; then + if [ "${REPLY}" == "y" ] || [ "${REPLY}" == "Y" ]; then echo "Removing existing key..." sleep 3 @@ -49,10 +51,10 @@ function build_prox_image() { if [ "${USE_DOCKER_CACHE}" == "y" ]; then echo "Building image using cache..." - docker build --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} + docker build --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} 2>&1 | tee ./${IMAGE_BUILD_LOG} else echo "Building image without cache..." - docker build --no-cache --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} + docker build --no-cache --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} 2>&1 | tee ./${IMAGE_BUILD_LOG} fi } -- cgit 1.2.3-korg